summaryrefslogtreecommitdiffstats
path: root/remoting/host/win
diff options
context:
space:
mode:
authoravi <avi@chromium.org>2014-12-22 16:27:27 -0800
committerCommit bot <commit-bot@chromium.org>2014-12-23 00:28:12 +0000
commit429bbdd261e1530b951ba528081343d2c9947408 (patch)
treea5c0f82288df21d027b3ea2a3e96acbf99cf3340 /remoting/host/win
parent3a928a843fe9b2a13885d1f488d95465b5e5d0f1 (diff)
downloadchromium_src-429bbdd261e1530b951ba528081343d2c9947408.zip
chromium_src-429bbdd261e1530b951ba528081343d2c9947408.tar.gz
chromium_src-429bbdd261e1530b951ba528081343d2c9947408.tar.bz2
Make callers of CommandLine use it via the base:: namespace.
Covers jingle/, media/, ppapi/, remoting/, rlz/, skia/, and sync/. BUG=422426 TEST=none TBR=ben@chromium.org Review URL: https://codereview.chromium.org/819203002 Cr-Commit-Position: refs/heads/master@{#309502}
Diffstat (limited to 'remoting/host/win')
-rw-r--r--remoting/host/win/unprivileged_process_delegate.cc2
-rw-r--r--remoting/host/win/wts_session_process_delegate.cc8
2 files changed, 5 insertions, 5 deletions
diff --git a/remoting/host/win/unprivileged_process_delegate.cc b/remoting/host/win/unprivileged_process_delegate.cc
index 9b22a70..2f0bb62 100644
--- a/remoting/host/win/unprivileged_process_delegate.cc
+++ b/remoting/host/win/unprivileged_process_delegate.cc
@@ -214,7 +214,7 @@ bool CreateWindowStationAndDesktop(ScopedSid logon_sid,
UnprivilegedProcessDelegate::UnprivilegedProcessDelegate(
scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
- scoped_ptr<CommandLine> target_command)
+ scoped_ptr<base::CommandLine> target_command)
: io_task_runner_(io_task_runner),
event_handler_(NULL),
target_command_(target_command.Pass()) {
diff --git a/remoting/host/win/wts_session_process_delegate.cc b/remoting/host/win/wts_session_process_delegate.cc
index a28ac5a..42b8b8c 100644
--- a/remoting/host/win/wts_session_process_delegate.cc
+++ b/remoting/host/win/wts_session_process_delegate.cc
@@ -45,7 +45,7 @@ class WtsSessionProcessDelegate::Core
public IPC::Listener {
public:
Core(scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
- scoped_ptr<CommandLine> target,
+ scoped_ptr<base::CommandLine> target,
bool launch_elevated,
const std::string& channel_security);
@@ -133,7 +133,7 @@ class WtsSessionProcessDelegate::Core
base::win::ScopedHandle session_token_;
// Command line of the launched process.
- scoped_ptr<CommandLine> target_command_;
+ scoped_ptr<base::CommandLine> target_command_;
// The handle of the worker process, if launched.
base::win::ScopedHandle worker_process_;
@@ -143,7 +143,7 @@ class WtsSessionProcessDelegate::Core
WtsSessionProcessDelegate::Core::Core(
scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
- scoped_ptr<CommandLine> target_command,
+ scoped_ptr<base::CommandLine> target_command,
bool launch_elevated,
const std::string& channel_security)
: caller_task_runner_(base::ThreadTaskRunnerHandle::Get()),
@@ -530,7 +530,7 @@ void WtsSessionProcessDelegate::Core::ReportProcessLaunched(
WtsSessionProcessDelegate::WtsSessionProcessDelegate(
scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
- scoped_ptr<CommandLine> target_command,
+ scoped_ptr<base::CommandLine> target_command,
bool launch_elevated,
const std::string& channel_security) {
core_ = new Core(io_task_runner,