diff options
| author | Ben Murdoch <benm@google.com> | 2014-04-03 12:29:45 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-04-03 12:29:45 +0100 |
| commit | e5d81f57cb97b3b6b7fccc9c5610d21eb81db09d (patch) | |
| tree | f266aab56db899073b21c1edd1d0e00055b9a2cf /content/browser/browser_main_loop.cc | |
| parent | 67e8dac6e410a019f58fc452b262a184e8e7fd12 (diff) | |
| download | chromium_org-e5d81f57cb97b3b6b7fccc9c5610d21eb81db09d.tar.gz | |
Merge from Chromium at DEPS revision 261286
This commit was generated by merge_to_master.py.
Change-Id: Iea9643ce91618057f128e9a5b62c07be152f2b89
Diffstat (limited to 'content/browser/browser_main_loop.cc')
| -rw-r--r-- | content/browser/browser_main_loop.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc index ab045e4fad..cb250c1b98 100644 --- a/content/browser/browser_main_loop.cc +++ b/content/browser/browser_main_loop.cc @@ -958,9 +958,7 @@ int BrowserMainLoop::BrowserThreadsStarted() { bool always_uses_gpu = IsForceCompositingModeEnabled(); bool established_gpu_channel = false; #if defined(USE_AURA) || defined(OS_ANDROID) - established_gpu_channel = - parsed_command_line_.HasSwitch(switches::kSingleProcess) || - parsed_command_line_.HasSwitch(switches::kInProcessGPU); + established_gpu_channel = true; #if defined(USE_AURA) if (!GpuDataManagerImpl::GetInstance()->CanUseGpuBrowserCompositor()) { established_gpu_channel = always_uses_gpu = false; |