Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(414)

Side by Side Diff: content/shell/app/shell_main_delegate.cc

Issue 1998723002: Move code in ui/gl/* from gfx:: to gl:: (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/renderer/renderer_blink_platform_impl.cc ('k') | content/test/content_test_suite.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/shell/app/shell_main_delegate.h" 5 #include "content/shell/app/shell_main_delegate.h"
6 6
7 #include "base/base_switches.h" 7 #include "base/base_switches.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/cpu.h" 9 #include "base/cpu.h"
10 #include "base/files/file.h" 10 #include "base/files/file.h"
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 *exit_code = 1; 161 *exit_code = 1;
162 return true; 162 return true;
163 } 163 }
164 #endif 164 #endif
165 command_line.AppendSwitch(switches::kProcessPerTab); 165 command_line.AppendSwitch(switches::kProcessPerTab);
166 command_line.AppendSwitch(switches::kEnableLogging); 166 command_line.AppendSwitch(switches::kEnableLogging);
167 command_line.AppendSwitch(switches::kAllowFileAccessFromFiles); 167 command_line.AppendSwitch(switches::kAllowFileAccessFromFiles);
168 // only default to osmesa if the flag isn't already specified. 168 // only default to osmesa if the flag isn't already specified.
169 if (!command_line.HasSwitch(switches::kUseGL)) { 169 if (!command_line.HasSwitch(switches::kUseGL)) {
170 command_line.AppendSwitchASCII(switches::kUseGL, 170 command_line.AppendSwitchASCII(switches::kUseGL,
171 gfx::kGLImplementationOSMesaName); 171 gl::kGLImplementationOSMesaName);
172 } 172 }
173 command_line.AppendSwitch(switches::kSkipGpuDataLoading); 173 command_line.AppendSwitch(switches::kSkipGpuDataLoading);
174 command_line.AppendSwitchASCII(switches::kTouchEvents, 174 command_line.AppendSwitchASCII(switches::kTouchEvents,
175 switches::kTouchEventsEnabled); 175 switches::kTouchEventsEnabled);
176 if (!command_line.HasSwitch(switches::kForceDeviceScaleFactor)) 176 if (!command_line.HasSwitch(switches::kForceDeviceScaleFactor))
177 command_line.AppendSwitchASCII(switches::kForceDeviceScaleFactor, "1.0"); 177 command_line.AppendSwitchASCII(switches::kForceDeviceScaleFactor, "1.0");
178 command_line.AppendSwitch( 178 command_line.AppendSwitch(
179 switches::kDisableGestureRequirementForMediaPlayback); 179 switches::kDisableGestureRequirementForMediaPlayback);
180 180
181 if (!command_line.HasSwitch(switches::kStableReleaseMode)) { 181 if (!command_line.HasSwitch(switches::kStableReleaseMode)) {
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 366
367 return renderer_client_.get(); 367 return renderer_client_.get();
368 } 368 }
369 369
370 ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() { 370 ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() {
371 utility_client_.reset(new ShellContentUtilityClient); 371 utility_client_.reset(new ShellContentUtilityClient);
372 return utility_client_.get(); 372 return utility_client_.get();
373 } 373 }
374 374
375 } // namespace content 375 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/renderer_blink_platform_impl.cc ('k') | content/test/content_test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698