diff options
18 files changed, 51 insertions, 44 deletions
diff --git a/content/app/android/content_main.cc b/content/app/android/content_main.cc index bb98ce7..bd509ca 100644 --- a/content/app/android/content_main.cc +++ b/content/app/android/content_main.cc @@ -28,9 +28,9 @@ LazyInstance<scoped_ptr<ContentMainDelegate> > g_content_main_delegate = } // namespace -static void InitApplicationContext(JNIEnv* env, - jclass clazz, - jobject context) { +namespace content { + +static void InitApplicationContext(JNIEnv* env, jclass clazz, jobject context) { base::android::ScopedJavaLocalRef<jobject> scoped_context(env, context); base::android::InitApplicationContext(scoped_context); } @@ -56,8 +56,6 @@ static jint Start(JNIEnv* env, jclass clazz) { return g_content_runner.Get()->Run(); } -namespace content { - void SetContentMainDelegate(ContentMainDelegate* delegate) { DCHECK(!g_content_main_delegate.Get().get()); g_content_main_delegate.Get().reset(delegate); diff --git a/content/app/android/library_loader_hooks.cc b/content/app/android/library_loader_hooks.cc index 2287a19..0661fe1 100644 --- a/content/app/android/library_loader_hooks.cc +++ b/content/app/android/library_loader_hooks.cc @@ -30,8 +30,10 @@ namespace { base::AtExitManager* g_at_exit_manager = NULL; } -jboolean LibraryLoadedOnMainThread(JNIEnv* env, jclass clazz, - jobjectArray init_command_line) { +namespace content { + +static jboolean LibraryLoadedOnMainThread(JNIEnv* env, jclass clazz, + jobjectArray init_command_line) { InitNativeCommandLineFromJavaArray(env, init_command_line); CommandLine* command_line = CommandLine::ForCurrentProcess(); @@ -78,8 +80,6 @@ jboolean LibraryLoadedOnMainThread(JNIEnv* env, jclass clazz, return JNI_TRUE; } -namespace content { - void LibraryLoaderExitHook() { if (g_at_exit_manager) { delete g_at_exit_manager; diff --git a/content/browser/android/android_browser_process.cc b/content/browser/android/android_browser_process.cc index fab5ae8..6b1ec64 100644 --- a/content/browser/android/android_browser_process.cc +++ b/content/browser/android/android_browser_process.cc @@ -13,12 +13,14 @@ using base::android::ConvertJavaStringToUTF8; +namespace content { + static void SetCommandLineFlags(JNIEnv*env, jclass clazz, jint max_render_process_count, jstring plugin_descriptor) { std::string plugin_str = ConvertJavaStringToUTF8(env, plugin_descriptor); - content::SetContentCommandLineFlags(max_render_process_count, plugin_str); + SetContentCommandLineFlags(max_render_process_count, plugin_str); } static jboolean IsOfficialBuild(JNIEnv* env, jclass clazz) { @@ -29,8 +31,6 @@ static jboolean IsOfficialBuild(JNIEnv* env, jclass clazz) { #endif } -namespace content { - bool RegisterAndroidBrowserProcess(JNIEnv* env) { return RegisterNativesImpl(env); } diff --git a/content/browser/android/content_settings.cc b/content/browser/android/content_settings.cc index 1080658..284c1fe 100644 --- a/content/browser/android/content_settings.cc +++ b/content/browser/android/content_settings.cc @@ -284,9 +284,8 @@ void ContentSettings::RenderViewCreated(RenderViewHost* render_view_host) { SyncToNativeImpl(); } -jint Init( - JNIEnv* env, jobject obj, jint nativeContentViewCore, - jboolean is_master_mode) { +static jint Init(JNIEnv* env, jobject obj, jint nativeContentViewCore, + jboolean is_master_mode) { WebContents* web_contents = reinterpret_cast<ContentViewCoreImpl*>(nativeContentViewCore) ->web_contents(); @@ -295,7 +294,7 @@ jint Init( return reinterpret_cast<jint>(content_settings); } -jstring GetDefaultUserAgent(JNIEnv* env, jclass clazz) { +static jstring GetDefaultUserAgent(JNIEnv* env, jclass clazz) { // "Version/4.0" had been hardcoded in the legacy WebView. std::string ua = webkit_glue::BuildUserAgentFromProduct("Version/4.0"); return base::android::ConvertUTF8ToJavaString(env, ua).Release(); diff --git a/content/browser/android/download_controller.cc b/content/browser/android/download_controller.cc index ca6b90a..16e370a 100644 --- a/content/browser/android/download_controller.cc +++ b/content/browser/android/download_controller.cc @@ -31,18 +31,18 @@ using base::android::ConvertUTF8ToJavaString; using base::android::GetClass; using base::android::ScopedJavaLocalRef; -// JNI methods -static void Init(JNIEnv* env, jobject obj) { - content::DownloadController::GetInstance()->Init(env, obj); -} - namespace { -const char* kDownloadControllerClassPathName = +const char kDownloadControllerClassPathName[] = "org/chromium/content/browser/DownloadController"; } // namespace namespace content { +// JNI methods +static void Init(JNIEnv* env, jobject obj) { + DownloadController::GetInstance()->Init(env, obj); +} + struct DownloadController::JavaObject { ScopedJavaLocalRef<jobject> Controller(JNIEnv* env) { return GetRealObject(env, obj); diff --git a/content/browser/android/sandboxed_process_launcher.cc b/content/browser/android/sandboxed_process_launcher.cc index d1be764..9ab99a4 100644 --- a/content/browser/android/sandboxed_process_launcher.cc +++ b/content/browser/android/sandboxed_process_launcher.cc @@ -16,6 +16,8 @@ using base::android::ScopedJavaLocalRef; using base::GlobalDescriptors; using content::StartSandboxedProcessCallback; +namespace content { + // Called from SandboxedProcessLauncher.java when the SandboxedProcess was // started. // |client_context| is the pointer to StartSandboxedProcessCallback which was @@ -31,8 +33,6 @@ static void OnSandboxedProcessStarted(JNIEnv*, delete callback; } -namespace content { - void StartSandboxedProcess( const CommandLine::StringVector& argv, int ipc_fd, diff --git a/content/common/android/surface_callback.cc b/content/common/android/surface_callback.cc index de83bbd..069c49b 100644 --- a/content/common/android/surface_callback.cc +++ b/content/common/android/surface_callback.cc @@ -23,6 +23,8 @@ using base::android::GetMethodID; using base::WaitableEvent; using content::SurfaceTexturePeer; +namespace content { + namespace { struct GlobalState { @@ -34,8 +36,8 @@ struct GlobalState { // and gpu thread, so we need to store the msg loops separately. scoped_refptr<base::MessageLoopProxy> native_window_loop; scoped_refptr<base::MessageLoopProxy> video_surface_loop; - content::NativeWindowCallback native_window_callback; - content::VideoSurfaceCallback video_surface_callback; + NativeWindowCallback native_window_callback; + VideoSurfaceCallback video_surface_callback; }; base::LazyInstance<GlobalState>::Leaky g_state = LAZY_INSTANCE_INITIALIZER; @@ -67,9 +69,6 @@ static void SetSurface(JNIEnv* env, jclass clazz, primaryID, secondaryID, NULL); } - -namespace content { - void ReleaseSurface(jobject surface) { if (surface == NULL) return; diff --git a/content/public/android/java/src/org/chromium/content/app/ContentMain.java b/content/public/android/java/src/org/chromium/content/app/ContentMain.java index a97d12b..4ff24ec 100644 --- a/content/public/android/java/src/org/chromium/content/app/ContentMain.java +++ b/content/public/android/java/src/org/chromium/content/app/ContentMain.java @@ -6,6 +6,8 @@ package org.chromium.content.app; import android.content.Context; +import org.chromium.base.JNINamespace; + /** * This class is used to initialize all types of process. It corresponds to * content/public/app/content_main.h which is not used in Android as it has @@ -16,6 +18,7 @@ import android.content.Context; * specific initialization code in ContentMainRunner::Initialize. * **/ +@JNINamespace("content") public class ContentMain { /** * Initialize application context in native side. diff --git a/content/public/android/java/src/org/chromium/content/app/LibraryLoader.java b/content/public/android/java/src/org/chromium/content/app/LibraryLoader.java index 33a4937..b2466de 100644 --- a/content/public/android/java/src/org/chromium/content/app/LibraryLoader.java +++ b/content/public/android/java/src/org/chromium/content/app/LibraryLoader.java @@ -9,6 +9,7 @@ import android.os.Handler; import android.text.TextUtils; import android.util.Log; +import org.chromium.base.JNINamespace; import org.chromium.content.common.CommandLine; import org.chromium.content.common.TraceEvent; @@ -18,6 +19,7 @@ import org.chromium.content.common.TraceEvent; // - asynchronously load and register the native library. This is used by callers // that can do more work in the java-side, and let a separate thread do all the // file IO and library loading. +@JNINamespace("content") public class LibraryLoader { private static final String TAG = "LibraryLoader"; diff --git a/content/public/android/java/src/org/chromium/content/browser/AndroidBrowserProcess.java b/content/public/android/java/src/org/chromium/content/browser/AndroidBrowserProcess.java index 38d1a58..076dabc 100644 --- a/content/public/android/java/src/org/chromium/content/browser/AndroidBrowserProcess.java +++ b/content/public/android/java/src/org/chromium/content/browser/AndroidBrowserProcess.java @@ -9,6 +9,7 @@ import android.content.Context; import android.content.res.Resources; import android.util.Log; +import org.chromium.base.JNINamespace; import org.chromium.content.app.AppResource; import org.chromium.content.app.ContentMain; import org.chromium.content.app.LibraryLoader; @@ -17,6 +18,7 @@ import org.chromium.content.browser.ResourceExtractor; import org.chromium.content.common.CommandLine; // NOTE: This file hasn't been fully upstreamed, please don't merge to downstream. +@JNINamespace("content") public class AndroidBrowserProcess { private static final String TAG = "BrowserProcessMain"; diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java index 3660fac..1d789f6 100644 --- a/content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java +++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java @@ -14,6 +14,8 @@ import android.view.KeyEvent; import org.chromium.base.AccessedByNative; import org.chromium.base.CalledByNative; +import org.chromium.base.JNINamespace; +import org.chromium.content.browser.ContentHttpAuthHandler; import java.net.URISyntaxException; diff --git a/content/public/android/java/src/org/chromium/content/browser/DownloadController.java b/content/public/android/java/src/org/chromium/content/browser/DownloadController.java index 496ea65..322e521 100644 --- a/content/public/android/java/src/org/chromium/content/browser/DownloadController.java +++ b/content/public/android/java/src/org/chromium/content/browser/DownloadController.java @@ -8,12 +8,14 @@ import android.content.Context; import android.webkit.DownloadListener; import org.chromium.base.CalledByNative; +import org.chromium.base.JNINamespace; /** * Java counterpart of android DownloadController. * * Its a singleton class instantiated by the C++ DownloadController. */ +@JNINamespace("content") class DownloadController { private static final String LOGTAG = "DownloadController"; private static DownloadController sInstance; diff --git a/content/public/android/java/src/org/chromium/content/browser/SandboxedProcessLauncher.java b/content/public/android/java/src/org/chromium/content/browser/SandboxedProcessLauncher.java index 3627523..04a6973 100644 --- a/content/public/android/java/src/org/chromium/content/browser/SandboxedProcessLauncher.java +++ b/content/public/android/java/src/org/chromium/content/browser/SandboxedProcessLauncher.java @@ -13,6 +13,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.chromium.base.CalledByNative; +import org.chromium.base.JNINamespace; import org.chromium.base.ThreadUtils; import org.chromium.content.app.LibraryLoader; import org.chromium.content.common.CommandLine; @@ -23,6 +24,7 @@ import org.chromium.content.common.ISandboxedProcessService; * This class provides the method to start/stop SandboxedProcess called by * native. */ +@JNINamespace("content") public class SandboxedProcessLauncher { private static String TAG = "SandboxedProcessLauncher"; diff --git a/content/public/android/java/src/org/chromium/content/common/SurfaceCallback.java b/content/public/android/java/src/org/chromium/content/common/SurfaceCallback.java index 13ea95b..e101933 100644 --- a/content/public/android/java/src/org/chromium/content/common/SurfaceCallback.java +++ b/content/public/android/java/src/org/chromium/content/common/SurfaceCallback.java @@ -6,9 +6,12 @@ package org.chromium.content.common; import android.view.Surface; +import org.chromium.base.JNINamespace; + /* This implements the entry point for passing a Surface handle received through Binder * back to the native code. */ +@JNINamespace("content") public class SurfaceCallback { // Calling setSurface passes ownership to the callee and calls release() on the passed in // object. diff --git a/content/shell/android/java/src/org/chromium/content_shell/ShellManager.java b/content/shell/android/java/src/org/chromium/content_shell/ShellManager.java index 7ea2906..611da85 100644 --- a/content/shell/android/java/src/org/chromium/content_shell/ShellManager.java +++ b/content/shell/android/java/src/org/chromium/content_shell/ShellManager.java @@ -10,10 +10,12 @@ import android.view.LayoutInflater; import android.widget.FrameLayout; import org.chromium.base.CalledByNative; +import org.chromium.base.JNINamespace; /** * Container and generator of ShellViews. */ +@JNINamespace("content") public class ShellManager extends FrameLayout { private ShellView mActiveShellView; diff --git a/content/shell/android/java/src/org/chromium/content_shell/ShellView.java b/content/shell/android/java/src/org/chromium/content_shell/ShellView.java index 154ea23..ad8860a 100644 --- a/content/shell/android/java/src/org/chromium/content_shell/ShellView.java +++ b/content/shell/android/java/src/org/chromium/content_shell/ShellView.java @@ -20,12 +20,14 @@ import android.widget.TextView; import android.widget.TextView.OnEditorActionListener; import org.chromium.base.CalledByNative; +import org.chromium.base.JNINamespace; import org.chromium.content.browser.ContentView; import org.chromium.content.browser.ContentViewClient; /** * Container for the various UI components that make up a shell window. */ +@JNINamespace("content") public class ShellView extends LinearLayout { private static final long COMPLETED_PROGRESS_TIMEOUT_MS = 200; diff --git a/content/shell/android/shell_manager.cc b/content/shell/android/shell_manager.cc index edfc9e2..77a7aec 100644 --- a/content/shell/android/shell_manager.cc +++ b/content/shell/android/shell_manager.cc @@ -28,13 +28,9 @@ bool RegisterShellManager(JNIEnv* env) { return RegisterNativesImpl(env); } -} // namespace content - -// ---------------------------------------------------------------------------- -// Native JNI methods -// ---------------------------------------------------------------------------- - -void Init(JNIEnv* env, jclass clazz, jobject obj) { +static void Init(JNIEnv* env, jclass clazz, jobject obj) { g_content_shell_manager.Get().Reset( base::android::ScopedJavaLocalRef<jobject>(env, obj)); } + +} // namespace content diff --git a/content/shell/android/shell_view.cc b/content/shell/android/shell_view.cc index 5b659cc..63f8fdc 100644 --- a/content/shell/android/shell_view.cc +++ b/content/shell/android/shell_view.cc @@ -28,13 +28,8 @@ bool ShellView::Register(JNIEnv* env) { return RegisterNativesImpl(env); } -} // namespace content - -// ---------------------------------------------------------------------------- -// Native JNI methods -// ---------------------------------------------------------------------------- - static jint Init(JNIEnv* env, jobject obj) { - content::ShellView* shell_view = new content::ShellView(env, obj); - return reinterpret_cast<jint>(shell_view); + return reinterpret_cast<jint>(new ShellView(env, obj)); } + +} // namespace content |