diff options
| author | michaelbai@chromium.org <michaelbai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-11 03:25:47 +0000 |
|---|---|---|
| committer | michaelbai@chromium.org <michaelbai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-11 03:25:47 +0000 |
| commit | 956a692e879040f6f3f06db56a892fceb4c15464 (patch) | |
| tree | 1f0b9a2ea7e635baa6e499c5539fb3c387a29c2b | |
| parent | 96364fe87f979e329cbd6c9cf7bf6cf1e16b8478 (diff) | |
| download | chromium_src-956a692e879040f6f3f06db56a892fceb4c15464.zip chromium_src-956a692e879040f6f3f06db56a892fceb4c15464.tar.gz chromium_src-956a692e879040f6f3f06db56a892fceb4c15464.tar.bz2 | |
Clean up the remaining diff in content/app
BUG=
TEST=
Review URL: https://chromiumcodereview.appspot.com/10703130
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146042 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/app/android/content_main.cc | 2 | ||||
| -rw-r--r-- | content/app/android/library_loader_hooks.cc | 6 | ||||
| -rw-r--r-- | content/app/content_main_runner.cc | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/content/app/android/content_main.cc b/content/app/android/content_main.cc index bdfd975..bb98ce7 100644 --- a/content/app/android/content_main.cc +++ b/content/app/android/content_main.cc @@ -4,8 +4,8 @@ #include "content/app/android/content_main.h" -#include "base/base_switches.h" #include "base/at_exit.h" +#include "base/base_switches.h" #include "base/command_line.h" #include "base/lazy_instance.h" #include "content/app/android/user_agent.h" diff --git a/content/app/android/library_loader_hooks.cc b/content/app/android/library_loader_hooks.cc index db61cb6..2287a19 100644 --- a/content/app/android/library_loader_hooks.cc +++ b/content/app/android/library_loader_hooks.cc @@ -32,9 +32,6 @@ base::AtExitManager* g_at_exit_manager = NULL; jboolean LibraryLoadedOnMainThread(JNIEnv* env, jclass clazz, jobjectArray init_command_line) { - // We need the Chrome AtExitManager to be created before we do any tracing or - // logging. - g_at_exit_manager = new base::AtExitManager(); InitNativeCommandLineFromJavaArray(env, init_command_line); CommandLine* command_line = CommandLine::ForCurrentProcess(); @@ -91,6 +88,9 @@ void LibraryLoaderExitHook() { } bool RegisterLibraryLoaderEntryHook(JNIEnv* env) { + // We need the AtExitManager to be created at the very beginning. + g_at_exit_manager = new base::AtExitManager(); + return RegisterNativesImpl(env); } diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc index 3e2a3af..6e030f0 100644 --- a/content/app/content_main_runner.cc +++ b/content/app/content_main_runner.cc @@ -333,7 +333,7 @@ int RunZygote(const MainFunctionParams& main_function_params, NOTREACHED() << "Unknown zygote process type: " << process_type; return 1; } -#endif // defined(OS_POSIX) && !defined(OS_MACOSX) +#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) // Run the FooMain() for a given process type. // If |process_type| is empty, runs BrowserMain(). |