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

Side by Side Diff: win8/delegate_execute/delegate_execute_operation.cc

Issue 819223002: Make callers of CommandLine use it via the base:: namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 5 years, 12 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
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 "win8/delegate_execute/delegate_execute_operation.h" 5 #include "win8/delegate_execute/delegate_execute_operation.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/strings/string_number_conversions.h" 8 #include "base/strings/string_number_conversions.h"
9 #include "base/strings/string_split.h" 9 #include "base/strings/string_split.h"
10 #include "base/win/windows_version.h" 10 #include "base/win/windows_version.h"
11 #include "chrome/common/chrome_switches.h" 11 #include "chrome/common/chrome_switches.h"
12 #include "win8/delegate_execute/delegate_execute_util.h" 12 #include "win8/delegate_execute/delegate_execute_util.h"
13 13
14 namespace delegate_execute { 14 namespace delegate_execute {
15 15
16 DelegateExecuteOperation::DelegateExecuteOperation() 16 DelegateExecuteOperation::DelegateExecuteOperation()
17 : operation_type_(DELEGATE_EXECUTE) { 17 : operation_type_(DELEGATE_EXECUTE) {
18 } 18 }
19 19
20 DelegateExecuteOperation::~DelegateExecuteOperation() { 20 DelegateExecuteOperation::~DelegateExecuteOperation() {
21 } 21 }
22 22
23 bool DelegateExecuteOperation::Init(const CommandLine* cmd_line) { 23 bool DelegateExecuteOperation::Init(const base::CommandLine* cmd_line) {
24 if (base::win::GetVersion() >= base::win::VERSION_WIN7) { 24 if (base::win::GetVersion() >= base::win::VERSION_WIN7) {
25 base::FilePath shortcut( 25 base::FilePath shortcut(
26 cmd_line->GetSwitchValuePath(switches::kRelaunchShortcut)); 26 cmd_line->GetSwitchValuePath(switches::kRelaunchShortcut));
27 // On Windows 7 the command line coming in may not have a path to the 27 // On Windows 7 the command line coming in may not have a path to the
28 // shortcut to launch Chrome. We ignore the shortcut and just do a regular 28 // shortcut to launch Chrome. We ignore the shortcut and just do a regular
29 // ShellExecute of chrome.exe in this case. 29 // ShellExecute of chrome.exe in this case.
30 if (shortcut.empty() && 30 if (shortcut.empty() &&
31 base::win::GetVersion() >= base::win::VERSION_WIN8) { 31 base::win::GetVersion() >= base::win::VERSION_WIN8) {
32 operation_type_ = DELEGATE_EXECUTE; 32 operation_type_ = DELEGATE_EXECUTE;
33 return true; 33 return true;
(...skipping 22 matching lines...) Expand all
56 base::SplitString(mutex_, L'.', &parts); 56 base::SplitString(mutex_, L'.', &parts);
57 if (parts.size() != 3) 57 if (parts.size() != 3)
58 return 0; 58 return 0;
59 DWORD pid; 59 DWORD pid;
60 if (!base::StringToUint(parts[2], reinterpret_cast<uint32*>(&pid))) 60 if (!base::StringToUint(parts[2], reinterpret_cast<uint32*>(&pid)))
61 return 0; 61 return 0;
62 return pid; 62 return pid;
63 } 63 }
64 64
65 } // namespace delegate_execute 65 } // namespace delegate_execute
OLDNEW
« no previous file with comments | « win8/delegate_execute/delegate_execute.cc ('k') | win8/delegate_execute/delegate_execute_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698