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

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

Issue 6705031: Send policy blobs to session_manager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix nits Created 9 years, 9 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
« no previous file with comments | « chrome/browser/chromeos/login/signed_settings_helper.cc ('k') | chrome/browser/policy/cloud_policy_cache.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 382d6d2ea899b6fed5a1267d1422f2ec0817c56b..ce6c17fba7f1575922f33096c1f45c9bab511121 100644
--- a/chrome/browser/policy/browser_policy_connector.cc
+++ b/chrome/browser/policy/browser_policy_connector.cc
@@ -29,16 +29,10 @@
#endif
#if defined(OS_CHROMEOS)
+#include "chrome/browser/policy/device_policy_cache.h"
#include "chrome/browser/policy/device_policy_identity_strategy.h"
#endif
-namespace {
-
-const FilePath::CharType kDevicePolicyCacheFile[] =
- FILE_PATH_LITERAL("Policy");
-
-} // namespace
-
namespace policy {
BrowserPolicyConnector::BrowserPolicyConnector() {
@@ -49,20 +43,11 @@ BrowserPolicyConnector::BrowserPolicyConnector() {
#if defined(OS_CHROMEOS)
CommandLine* command_line = CommandLine::ForCurrentProcess();
- if (command_line->HasSwitch(switches::kDevicePolicyCacheDir)) {
- FilePath cache_dir(command_line->GetSwitchValuePath(
- switches::kDevicePolicyCacheDir));
-
- if (!file_util::CreateDirectory(cache_dir)) {
- LOG(WARNING) << "Device policy cache directory "
- << cache_dir.value()
- << " is not accessible, skipping initialization.";
- } else {
- identity_strategy_.reset(new DevicePolicyIdentityStrategy());
- cloud_policy_subsystem_.reset(
- new CloudPolicySubsystem(cache_dir.Append(kDevicePolicyCacheFile),
- identity_strategy_.get()));
- }
+ if (command_line->HasSwitch(switches::kEnableDevicePolicy)) {
+ identity_strategy_.reset(new DevicePolicyIdentityStrategy());
+ cloud_policy_subsystem_.reset(
+ new CloudPolicySubsystem(identity_strategy_.get(),
+ new DevicePolicyCache()));
}
#endif
}
« no previous file with comments | « chrome/browser/chromeos/login/signed_settings_helper.cc ('k') | chrome/browser/policy/cloud_policy_cache.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698