summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-02 18:55:49 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-02 18:55:49 +0000
commitfb4bcfa38b2cdd740fd112fabeb5d45add27354b (patch)
treeae328c487cad94671d0788b3287cdd053f5d46a6 /remoting
parent072b8d48705dc76cafa1aa8189f62a15c94aa7fb (diff)
downloadchromium_src-fb4bcfa38b2cdd740fd112fabeb5d45add27354b.zip
chromium_src-fb4bcfa38b2cdd740fd112fabeb5d45add27354b.tar.gz
chromium_src-fb4bcfa38b2cdd740fd112fabeb5d45add27354b.tar.bz2
Move some more file utils to the base namespace.
This also swaps the order of the parameters to GetShmemTempDir so the out parameter is last, and enhances some documentation. Review URL: https://codereview.chromium.org/93263002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238144 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r--remoting/host/branding.cc2
-rw-r--r--remoting/host/setup/daemon_controller_delegate_linux.cc2
-rw-r--r--remoting/host/setup/daemon_controller_delegate_mac.mm2
3 files changed, 3 insertions, 3 deletions
diff --git a/remoting/host/branding.cc b/remoting/host/branding.cc
index 908d9bc..840e982 100644
--- a/remoting/host/branding.cc
+++ b/remoting/host/branding.cc
@@ -46,7 +46,7 @@ base::FilePath GetConfigDir() {
#elif defined(OS_MACOSX)
PathService::Get(base::DIR_APP_DATA, &app_data_dir);
#else
- app_data_dir = file_util::GetHomeDir();
+ app_data_dir = base::GetHomeDir();
#endif
return app_data_dir.Append(kConfigDir);
diff --git a/remoting/host/setup/daemon_controller_delegate_linux.cc b/remoting/host/setup/daemon_controller_delegate_linux.cc
index 54be540..bed305f 100644
--- a/remoting/host/setup/daemon_controller_delegate_linux.cc
+++ b/remoting/host/setup/daemon_controller_delegate_linux.cc
@@ -55,7 +55,7 @@ std::string GetMd5(const std::string& value) {
base::FilePath GetConfigPath() {
std::string filename = "host#" + GetMd5(net::GetHostName()) + ".json";
- return file_util::GetHomeDir().
+ return base::GetHomeDir().
Append(".config/chrome-remote-desktop").Append(filename);
}
diff --git a/remoting/host/setup/daemon_controller_delegate_mac.mm b/remoting/host/setup/daemon_controller_delegate_mac.mm
index 749a6ab..bb27e88 100644
--- a/remoting/host/setup/daemon_controller_delegate_mac.mm
+++ b/remoting/host/setup/daemon_controller_delegate_mac.mm
@@ -224,7 +224,7 @@ bool DaemonControllerDelegateMac::DoShowPreferencePane(
const std::string& config_data) {
if (!config_data.empty()) {
base::FilePath config_path;
- if (!file_util::GetTempDir(&config_path)) {
+ if (!base::GetTempDir(&config_path)) {
LOG(ERROR) << "Failed to get filename for saving configuration data.";
return false;
}