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()); |