diff options
| -rw-r--r-- | remoting/host/desktop_process_main.cc | 2 | ||||
| -rw-r--r-- | remoting/host/remoting_me2me_host.cc | 2 | ||||
| -rw-r--r-- | remoting/host/win/daemon_process_main.cc | 2 | ||||
| -rw-r--r-- | rlz/chromeos/lib/rlz_value_store_chromeos.cc | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/remoting/host/desktop_process_main.cc b/remoting/host/desktop_process_main.cc index b1a7433..0b121d3 100644 --- a/remoting/host/desktop_process_main.cc +++ b/remoting/host/desktop_process_main.cc @@ -94,7 +94,7 @@ int DesktopProcessMain(int argc, char** argv) { // 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()); diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc index 708868c..d676b8f 100644 --- a/remoting/host/remoting_me2me_host.cc +++ b/remoting/host/remoting_me2me_host.cc @@ -1106,7 +1106,7 @@ int HostProcessMain(int argc, char** argv) { // 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()); diff --git a/remoting/host/win/daemon_process_main.cc b/remoting/host/win/daemon_process_main.cc index e7c2795..43b4d0c 100644 --- a/remoting/host/win/daemon_process_main.cc +++ b/remoting/host/win/daemon_process_main.cc @@ -44,7 +44,7 @@ const wchar_t kUsageMessage[] = const char* kCopiedSwitchNames[] = { "host-config", "daemon-pipe", switches::kV, switches::kVModule }; -void usage(const FilePath& program_name) { +void usage(const base::FilePath& program_name) { LOG(INFO) << StringPrintf(kUsageMessage, UTF16ToWide(program_name.value()).c_str()); } diff --git a/rlz/chromeos/lib/rlz_value_store_chromeos.cc b/rlz/chromeos/lib/rlz_value_store_chromeos.cc index 31577cc..47e32d1 100644 --- a/rlz/chromeos/lib/rlz_value_store_chromeos.cc +++ b/rlz/chromeos/lib/rlz_value_store_chromeos.cc @@ -42,17 +42,17 @@ const base::FilePath::CharType kRLZLockFileName[] = FILE_PATH_LITERAL("RLZ Data.lock"); // RLZ store path for testing. -FilePath g_testing_rlz_store_path_; +base::FilePath g_testing_rlz_store_path_; // Returns file path of the RLZ storage. -FilePath GetRlzStorePath() { +base::FilePath GetRlzStorePath() { return g_testing_rlz_store_path_.empty() ? file_util::GetHomeDir().Append(kRLZDataFileName) : g_testing_rlz_store_path_.Append(kRLZDataFileName); } // Returns file path of the RLZ storage lock file. -FilePath GetRlzStoreLockPath() { +base::FilePath GetRlzStoreLockPath() { return g_testing_rlz_store_path_.empty() ? file_util::GetHomeDir().Append(kRLZLockFileName) : g_testing_rlz_store_path_.Append(kRLZLockFileName); |