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

Unified Diff: content/shell/app/shell_main_delegate_mac.mm

Issue 803813003: Make callers of CommandLine use it via the base:: namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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 side-by-side diff with in-line comments
Download patch
Index: content/shell/app/shell_main_delegate_mac.mm
diff --git a/content/shell/app/shell_main_delegate_mac.mm b/content/shell/app/shell_main_delegate_mac.mm
index 74fca7e6115a2c4dc654851c697300e3b5c150cb..319171fea86d61cf2749893d817a65cff23b9626 100644
--- a/content/shell/app/shell_main_delegate_mac.mm
+++ b/content/shell/app/shell_main_delegate_mac.mm
@@ -19,7 +19,7 @@ namespace content {
void EnsureCorrectResolutionSettings() {
// Exit early if this isn't a browser process.
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kProcessType))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kProcessType))
return;
NSString* const kHighResolutionCapable = @"NSHighResolutionCapable";
@@ -28,8 +28,8 @@ void EnsureCorrectResolutionSettings() {
[[NSMutableDictionary alloc]
initWithContentsOfFile:base::mac::FilePathToNSString(info_plist)]);
- bool running_layout_tests =
- CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree);
+ bool running_layout_tests = base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kDumpRenderTree);
bool not_high_resolution_capable =
[info_dict objectForKey:kHighResolutionCapable] &&
[[info_dict objectForKey:kHighResolutionCapable] isEqualToNumber:@(NO)];
@@ -41,8 +41,8 @@ void EnsureCorrectResolutionSettings() {
CHECK([info_dict writeToFile:base::mac::FilePathToNSString(info_plist)
atomically:YES]);
- const CommandLine::StringVector& original_argv =
- CommandLine::ForCurrentProcess()->argv();
+ const base::CommandLine::StringVector& original_argv =
+ base::CommandLine::ForCurrentProcess()->argv();
char** argv = new char*[original_argv.size() + 1];
for (unsigned i = 0; i < original_argv.size(); ++i)
argv[i] = const_cast<char*>(original_argv.at(i).c_str());
« no previous file with comments | « content/shell/app/shell_main_delegate.cc ('k') | content/shell/browser/layout_test/layout_test_browser_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698