diff options
| author | michaelbai@chromium.org <michaelbai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-08 00:44:14 +0000 |
|---|---|---|
| committer | michaelbai@chromium.org <michaelbai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-08 00:44:14 +0000 |
| commit | e5df69d4c55438249f0c7e32d9efb6a63181b440 (patch) | |
| tree | 3c37ddb46bb2bdab0a882b33e42cdb6b7ef65ad4 /content/app | |
| parent | 5a073091c79e3d46a522edbcd4a7565b7d8505e5 (diff) | |
| download | chromium_src-e5df69d4c55438249f0c7e32d9efb6a63181b440.zip chromium_src-e5df69d4c55438249f0c7e32d9efb6a63181b440.tar.gz chromium_src-e5df69d4c55438249f0c7e32d9efb6a63181b440.tar.bz2 | |
- Removed the message loop from shell_browser_main_parts.cc. We don't need
that code as the message loop will be initialized by BrowserMainRunner.
- Cleared the unused code in shell_browser_main.cc
BUG=
TEST=
Review URL: https://chromiumcodereview.appspot.com/10536018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141134 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/app')
| -rw-r--r-- | content/app/content_main_runner.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc index 49b5bfc..ad4244a 100644 --- a/content/app/content_main_runner.cc +++ b/content/app/content_main_runner.cc @@ -357,6 +357,14 @@ int RunNamedProcessTypeMain( if (delegate) { int exit_code = delegate->RunProcess(process_type, main_function_params); +#if defined(OS_ANDROID) + // In Android's browser process, the negative exit code doesn't mean the + // default behavior should be used as the UI message loop is managed by + // the Java and the browser process's default behavior is always + // overridden. + if (process_type.empty()) + return exit_code; +#endif if (exit_code >= 0) return exit_code; } |