diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-17 23:07:15 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-17 23:07:15 +0000 |
commit | 2f3b1cce4c8d4d6a4b016f4d03fca5ee88348a2c (patch) | |
tree | 78766377b2779fe9b9afbc869a97f387b9b3d082 /remoting/host | |
parent | 936e85963a6d11c79c7ea774bc41c8729c04693f (diff) | |
download | chromium_src-2f3b1cce4c8d4d6a4b016f4d03fca5ee88348a2c.zip chromium_src-2f3b1cce4c8d4d6a4b016f4d03fca5ee88348a2c.tar.gz chromium_src-2f3b1cce4c8d4d6a4b016f4d03fca5ee88348a2c.tar.bz2 |
Move CommandLine to base namespace.
Fix all forward-declares and header files referencing CommandLine.
This keeps a "using base::CommandLine" in the command line header file so that the rest of the source files can be changes in a follow-up.
TBR=sky
Review URL: https://codereview.chromium.org/196413016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257514 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host')
-rw-r--r-- | remoting/host/win/host_service.h | 5 | ||||
-rw-r--r-- | remoting/host/win/launch_process_with_token.h | 2 | ||||
-rw-r--r-- | remoting/host/win/unprivileged_process_delegate.h | 7 | ||||
-rw-r--r-- | remoting/host/win/wts_session_process_delegate.h | 5 |
4 files changed, 8 insertions, 11 deletions
diff --git a/remoting/host/win/host_service.h b/remoting/host/win/host_service.h index 3c6b757..855f37c 100644 --- a/remoting/host/win/host_service.h +++ b/remoting/host/win/host_service.h @@ -15,9 +15,8 @@ #include "base/synchronization/waitable_event.h" #include "remoting/host/win/wts_terminal_monitor.h" -class CommandLine; - namespace base { +class CommandLine; class SingleThreadTaskRunner; } // namespace base @@ -32,7 +31,7 @@ class HostService : public WtsTerminalMonitor { static HostService* GetInstance(); // This function parses the command line and selects the action routine. - bool InitWithCommandLine(const CommandLine* command_line); + bool InitWithCommandLine(const base::CommandLine* command_line); // Invoke the choosen action routine. int Run(); diff --git a/remoting/host/win/launch_process_with_token.h b/remoting/host/win/launch_process_with_token.h index e3d11f1..55c27bf 100644 --- a/remoting/host/win/launch_process_with_token.h +++ b/remoting/host/win/launch_process_with_token.h @@ -32,7 +32,7 @@ bool CreateSessionToken(uint32 session_id, base::win::ScopedHandle* token_out); // If |inherit_handles| is true |g_inherit_handles_lock| should be taken while // any inheritable handles are open. bool LaunchProcessWithToken(const base::FilePath& binary, - const CommandLine::StringType& command_line, + const base::CommandLine::StringType& command_line, HANDLE user_token, SECURITY_ATTRIBUTES* process_attributes, SECURITY_ATTRIBUTES* thread_attributes, diff --git a/remoting/host/win/unprivileged_process_delegate.h b/remoting/host/win/unprivileged_process_delegate.h index 230da6e..435958c 100644 --- a/remoting/host/win/unprivileged_process_delegate.h +++ b/remoting/host/win/unprivileged_process_delegate.h @@ -15,9 +15,8 @@ #include "ipc/ipc_listener.h" #include "remoting/host/win/worker_process_launcher.h" -class CommandLine; - namespace base { +class CommandLine; class SingleThreadTaskRunner; } // namespace base @@ -37,7 +36,7 @@ class UnprivilegedProcessDelegate public: UnprivilegedProcessDelegate( scoped_refptr<base::SingleThreadTaskRunner> io_task_runner, - scoped_ptr<CommandLine> target_command); + scoped_ptr<base::CommandLine> target_command); virtual ~UnprivilegedProcessDelegate(); // WorkerProcessLauncher::Delegate implementation. @@ -59,7 +58,7 @@ class UnprivilegedProcessDelegate scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_; // Command line of the launched process. - scoped_ptr<CommandLine> target_command_; + scoped_ptr<base::CommandLine> target_command_; // The server end of the IPC channel used to communicate to the worker // process. diff --git a/remoting/host/win/wts_session_process_delegate.h b/remoting/host/win/wts_session_process_delegate.h index a953209..cfe856e 100644 --- a/remoting/host/win/wts_session_process_delegate.h +++ b/remoting/host/win/wts_session_process_delegate.h @@ -12,9 +12,8 @@ #include "base/threading/non_thread_safe.h" #include "remoting/host/win/worker_process_launcher.h" -class CommandLine; - namespace base { +class CommandLine; class SingleThreadTaskRunner; } // namespace base @@ -32,7 +31,7 @@ class WtsSessionProcessDelegate public: WtsSessionProcessDelegate( scoped_refptr<base::SingleThreadTaskRunner> io_task_runner, - scoped_ptr<CommandLine> target, + scoped_ptr<base::CommandLine> target, bool launch_elevated, const std::string& channel_security); ~WtsSessionProcessDelegate(); |