From e5d81f57cb97b3b6b7fccc9c5610d21eb81db09d Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Thu, 3 Apr 2014 12:29:45 +0100 Subject: Merge from Chromium at DEPS revision 261286 This commit was generated by merge_to_master.py. Change-Id: Iea9643ce91618057f128e9a5b62c07be152f2b89 --- content/browser/browser_main_loop.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'content/browser/browser_main_loop.cc') 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; -- cgit v1.2.3