diff options
| author | acleung@google.com <acleung@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-08 22:58:24 +0000 |
|---|---|---|
| committer | acleung@google.com <acleung@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-08 22:58:24 +0000 |
| commit | de449da5dd9ff67f2331986b2ce46a84f6d5de8d (patch) | |
| tree | 9970b8cd8b6c72a8b779cf78af5fc5f69b4f90f6 | |
| parent | e0832490090b060c31ba3e93e74f6b8fed573dbd (diff) | |
| download | chromium_src-de449da5dd9ff67f2331986b2ce46a84f6d5de8d.zip chromium_src-de449da5dd9ff67f2331986b2ce46a84f6d5de8d.tar.gz chromium_src-de449da5dd9ff67f2331986b2ce46a84f6d5de8d.tar.bz2 | |
Skips some initialization code that is not yet used in Android
BUG=152798
Review URL: https://chromiumcodereview.appspot.com/11033039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160735 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/app/chrome_main_delegate.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc index 158e0a7..c446c97 100644 --- a/chrome/app/chrome_main_delegate.cc +++ b/chrome/app/chrome_main_delegate.cc @@ -411,12 +411,15 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exit_code) { #endif #endif // OS_POSIX + // No support for ANDROID yet as DiagnosticsMain needs wchar support. +#if !defined(OS_ANDROID) // If we are in diagnostics mode this is the end of the line. After the // diagnostics are run the process will invariably exit. if (command_line.HasSwitch(switches::kDiagnostics)) { *exit_code = DiagnosticsMain(command_line); return true; } +#endif #if defined(OS_WIN) // Must do this before any other usage of command line! @@ -565,12 +568,15 @@ void ChromeMainDelegate::PreSandboxStartup() { if (command_line.HasSwitch(switches::kMessageLoopHistogrammer)) MessageLoop::EnableHistogrammer(true); +#if !defined(OS_ANDROID) + // Android does InitLogging when library is loaded. Skip here. logging::OldFileDeletionState file_state = logging::APPEND_TO_OLD_LOG_FILE; if (process_type.empty()) { file_state = logging::DELETE_OLD_LOG_FILE; } logging::InitChromeLogging(command_line, file_state); +#endif #if defined(OS_WIN) // TODO(darin): Kill this once http://crbug.com/52609 is fixed. |