diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-02 05:12:33 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-02 05:12:33 +0000 |
commit | a3ef4830d5b5fdc52e5d7d0cb33dae8844f0961e (patch) | |
tree | bdd4dac76e6034ef6cf33450e203269a715ea0e6 /remoting/host/remoting_me2me_host.cc | |
parent | 8bc574c57115e9ffd0169f33131c0865997dcb35 (diff) | |
download | chromium_src-a3ef4830d5b5fdc52e5d7d0cb33dae8844f0961e.zip chromium_src-a3ef4830d5b5fdc52e5d7d0cb33dae8844f0961e.tar.gz chromium_src-a3ef4830d5b5fdc52e5d7d0cb33dae8844f0961e.tar.bz2 |
Add FilePath to base namespace.
This updates headers that forward-declare it and a few random places to use the namespace explicitly. There us a using declaration in file_path.h that makes the rest compile, which we can do in future passes.
Review URL: https://codereview.chromium.org/12163003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180245 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/remoting_me2me_host.cc')
-rw-r--r-- | remoting/host/remoting_me2me_host.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc index 0e3d948..995b52d 100644 --- a/remoting/host/remoting_me2me_host.cc +++ b/remoting/host/remoting_me2me_host.cc @@ -273,7 +273,7 @@ class HostProcess scoped_ptr<IPC::ChannelProxy> daemon_channel_; // Created on the UI thread but used from the network thread. - FilePath host_config_path_; + base::FilePath host_config_path_; scoped_ptr<DesktopEnvironmentFactory> desktop_environment_factory_; // Accessed on the network thread. @@ -402,7 +402,7 @@ bool HostProcess::InitWithCommandLine(const CommandLine* cmd_line) { context_->network_task_runner())); } - FilePath default_config_dir = remoting::GetConfigDir(); + base::FilePath default_config_dir = remoting::GetConfigDir(); host_config_path_ = default_config_dir.Append(kDefaultHostConfigFile); if (cmd_line->HasSwitch(kHostConfigSwitchName)) { host_config_path_ = cmd_line->GetSwitchValuePath(kHostConfigSwitchName); @@ -427,7 +427,7 @@ void HostProcess::OnConfigUpdated( LOG(INFO) << "Processing new host configuration."; serialized_config_ = serialized_config; - scoped_ptr<JsonHostConfig> config(new JsonHostConfig(FilePath())); + scoped_ptr<JsonHostConfig> config(new JsonHostConfig(base::FilePath())); if (!config->SetSerializedData(serialized_config)) { LOG(ERROR) << "Invalid configuration."; ShutdownHost(kInvalidHostConfigurationExitCode); @@ -558,7 +558,7 @@ void HostProcess::StartOnUiThread() { #if defined(OS_LINUX) // If an audio pipe is specific on the command-line then initialize // AudioCapturerLinux to capture from it. - FilePath audio_pipe_name = CommandLine::ForCurrentProcess()-> + base::FilePath audio_pipe_name = CommandLine::ForCurrentProcess()-> GetSwitchValuePath(kAudioPipeSwitchName); if (!audio_pipe_name.empty()) { remoting::AudioCapturerLinux::InitializePipeReader( @@ -641,7 +641,7 @@ void HostProcess::ShutdownOnUiThread() { // thread will remain in-use and prevent the process from exiting. // TODO(wez): DesktopEnvironmentFactory should own the pipe reader. // See crbug.com/161373 and crbug.com/104544. - AudioCapturerLinux::InitializePipeReader(NULL, FilePath()); + AudioCapturerLinux::InitializePipeReader(NULL, base::FilePath()); #endif } @@ -1135,7 +1135,7 @@ int CALLBACK WinMain(HINSTANCE instance, // Mark the process as DPI-aware, so Windows won't scale coordinates in APIs. // N.B. This API exists on Vista and above. if (base::win::GetVersion() >= base::win::VERSION_VISTA) { - FilePath path(base::GetNativeLibraryName(UTF8ToUTF16("user32"))); + base::FilePath path(base::GetNativeLibraryName(UTF8ToUTF16("user32"))); base::ScopedNativeLibrary user32(path); CHECK(user32.is_valid()); |