diff options
author | kerz@chromium.org <kerz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-13 20:34:17 +0000 |
---|---|---|
committer | kerz@chromium.org <kerz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-13 20:34:17 +0000 |
commit | a5d3767bf2ddae040dd9bdb894bbe6276e7f5a2f (patch) | |
tree | 00c3a1524e653e7b53d58f08b53a82fe5be84172 /chrome/browser/chrome_browser_main_android.cc | |
parent | 0b7cfd68501ee871b626637193ee55d1e9b8884e (diff) | |
download | chromium_src-a5d3767bf2ddae040dd9bdb894bbe6276e7f5a2f.zip chromium_src-a5d3767bf2ddae040dd9bdb894bbe6276e7f5a2f.tar.gz chromium_src-a5d3767bf2ddae040dd9bdb894bbe6276e7f5a2f.tar.bz2 |
Revert 187933 "Revert 187465 "Android: Enable --composite-to-mai..."
> Revert 187465 "Android: Enable --composite-to-mailbox"
>
> > Android: Enable --composite-to-mailbox
> >
> > BUG=181640
> >
> > Review URL: https://chromiumcodereview.appspot.com/12734002
>
> TBR=sievers@chromium.org
> Review URL: https://codereview.chromium.org/12733010
TBR=kerz@chromium.org
Review URL: https://codereview.chromium.org/12463038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187934 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_browser_main_android.cc')
-rw-r--r-- | chrome/browser/chrome_browser_main_android.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/chrome_browser_main_android.cc b/chrome/browser/chrome_browser_main_android.cc index 1c8459d..d6651b5 100644 --- a/chrome/browser/chrome_browser_main_android.cc +++ b/chrome/browser/chrome_browser_main_android.cc @@ -6,6 +6,7 @@ #include "base/command_line.h" #include "base/path_service.h" +#include "cc/switches.h" #include "chrome/app/breakpad_linux.h" #include "chrome/browser/android/crash_dump_manager.h" #include "chrome/common/chrome_switches.h" @@ -61,6 +62,9 @@ void ChromeBrowserMainPartsAndroid::PreEarlyInitialization() { main_message_loop_.reset(new MessageLoop(MessageLoop::TYPE_UI)); MessageLoopForUI::current()->Start(); + CommandLine::ForCurrentProcess()->AppendSwitch( + cc::switches::kCompositeToMailbox); + ChromeBrowserMainParts::PreEarlyInitialization(); } |