Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(152)

Unified Diff: chrome/browser/policy/browser_policy_connector.cc

Issue 14192016: Move OS_CHROMEOS-specific paths to chromeos/chromeos_paths.cc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/policy/browser_policy_connector.cc
diff --git a/chrome/browser/policy/browser_policy_connector.cc b/chrome/browser/policy/browser_policy_connector.cc
index cafe4c5ad3ec164828d0424352064cb4b82cc1ec..68ce889e259fe2f592488917acf245399c8ac434 100644
--- a/chrome/browser/policy/browser_policy_connector.cc
+++ b/chrome/browser/policy/browser_policy_connector.cc
@@ -66,6 +66,7 @@
#include "chrome/browser/chromeos/system/statistics_provider.h"
#include "chrome/browser/chromeos/system/timezone_settings.h"
#include "chrome/browser/policy/cloud/resource_cache.h"
+#include "chromeos/chromeos_paths.h"
#include "chromeos/chromeos_switches.h"
#include "chromeos/dbus/cryptohome_client.h"
#include "chromeos/dbus/dbus_thread_manager.h"
@@ -136,7 +137,7 @@ BrowserPolicyConnector::BrowserPolicyConnector()
install_attributes_.reset(
new EnterpriseInstallAttributes(cryptohome, cryptohome_client));
base::FilePath install_attrs_file;
- CHECK(PathService::Get(chrome::FILE_INSTALL_ATTRIBUTES,
+ CHECK(PathService::Get(chromeos::FILE_INSTALL_ATTRIBUTES,
&install_attrs_file));
install_attributes_->ReadCacheFile(install_attrs_file);
@@ -329,7 +330,7 @@ void BrowserPolicyConnector::InitializeUserPolicy(
const base::FilePath resource_cache_dir =
profile_dir.Append(kPolicy).Append(kResourceDir);
base::FilePath policy_key_dir;
- CHECK(PathService::Get(chrome::DIR_USER_POLICY_KEYS, &policy_key_dir));
+ CHECK(PathService::Get(chromeos::DIR_USER_POLICY_KEYS, &policy_key_dir));
if (wait_for_policy_fetch)
device_management_service_->ScheduleInitialization(0);

Powered by Google App Engine
This is Rietveld 408576698