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

Side by Side Diff: chrome/test/base/test_launcher_utils.cc

Issue 10392068: ui: Move gl/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix mac_rel Created 8 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 | Annotate | Revision Log
« no previous file with comments | « chrome/common/chrome_switches.h ('k') | chrome/test/gpu/gpu_crash_browsertest.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 "chrome/test/base/test_launcher_utils.h" 5 #include "chrome/test/base/test_launcher_utils.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/environment.h" 8 #include "base/environment.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/path_service.h" 11 #include "base/path_service.h"
12 #include "base/string_number_conversions.h" 12 #include "base/string_number_conversions.h"
13 #include "chrome/common/chrome_paths.h" 13 #include "chrome/common/chrome_paths.h"
14 #include "chrome/common/chrome_switches.h" 14 #include "chrome/common/chrome_switches.h"
15 #include "ui/gfx/gl/gl_switches.h" 15 #include "ui/gl/gl_switches.h"
16 16
17 #if defined(USE_ASH) 17 #if defined(USE_ASH)
18 #include "ash/ash_switches.h" 18 #include "ash/ash_switches.h"
19 #endif 19 #endif
20 20
21 namespace test_launcher_utils { 21 namespace test_launcher_utils {
22 22
23 void PrepareBrowserCommandLineForTests(CommandLine* command_line) { 23 void PrepareBrowserCommandLineForTests(CommandLine* command_line) {
24 // Turn off tip loading for tests; see http://crbug.com/17725. 24 // Turn off tip loading for tests; see http://crbug.com/17725.
25 command_line->AppendSwitch(switches::kDisableWebResources); 25 command_line->AppendSwitch(switches::kDisableWebResources);
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 const std::string& implementation_name) { 104 const std::string& implementation_name) {
105 if (command_line->HasSwitch(switches::kUseGL)) 105 if (command_line->HasSwitch(switches::kUseGL))
106 return false; 106 return false;
107 107
108 command_line->AppendSwitchASCII(switches::kUseGL, implementation_name); 108 command_line->AppendSwitchASCII(switches::kUseGL, implementation_name);
109 109
110 return true; 110 return true;
111 } 111 }
112 112
113 } // namespace test_launcher_utils 113 } // namespace test_launcher_utils
OLDNEW
« no previous file with comments | « chrome/common/chrome_switches.h ('k') | chrome/test/gpu/gpu_crash_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698