diff options
| author | jkummerow@chromium.org <jkummerow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-23 09:54:25 +0000 |
|---|---|---|
| committer | jkummerow@chromium.org <jkummerow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-23 09:54:25 +0000 |
| commit | 985655a307077dc9385fa4ed00bed3b8a64a805a (patch) | |
| tree | 44b6ef8af1970224f900cf4da7fca9a35d414526 /chrome/browser/prefs | |
| parent | d63c6fc43c28f3153b3c6b758796e7d15c44bdd0 (diff) | |
| download | chromium_src-985655a307077dc9385fa4ed00bed3b8a64a805a.zip chromium_src-985655a307077dc9385fa4ed00bed3b8a64a805a.tar.gz chromium_src-985655a307077dc9385fa4ed00bed3b8a64a805a.tar.bz2 | |
Device policy infrastructure
This continues the work of http://codereview.chromium.org/6312121/. Description of that CL:
This refactors the cloud policy-related code to support device policy
that gets associated with the whole browser session. Device policy
information will show up in g_browser_process->local_state(). Also,
start supporting recommended policy from the cloud.
BUG=chromium-os:11259, chromium-os:11257, chromium-os:11256
TEST=Enable device policy by passing --device-policy-cache-dir, claim a device and verify that policy gets downloaded.
Review URL: http://codereview.chromium.org/6520008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75732 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs')
| -rw-r--r-- | chrome/browser/prefs/browser_prefs.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/prefs/pref_member.h | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index 0c76b2f..a03452f 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -34,7 +34,8 @@ #include "chrome/browser/notifications/notification_ui_manager.h" #include "chrome/browser/page_info_model.h" #include "chrome/browser/password_manager/password_manager.h" -#include "chrome/browser/policy/profile_policy_context.h" +#include "chrome/browser/policy/browser_policy_connector.h" +#include "chrome/browser/policy/profile_policy_connector.h" #include "chrome/browser/prefs/session_startup_pref.h" #include "chrome/browser/profiles/profile_impl.h" #include "chrome/browser/renderer_host/browser_render_process_host.h" @@ -101,6 +102,7 @@ void RegisterLocalState(PrefService* local_state) { BackgroundPageTracker::RegisterPrefs(local_state); NotificationUIManager::RegisterPrefs(local_state); PrefProxyConfigService::RegisterPrefs(local_state); + policy::BrowserPolicyConnector::RegisterPrefs(local_state); #if defined(OS_CHROMEOS) chromeos::AudioMixerAlsa::RegisterPrefs(local_state); chromeos::UserManager::RegisterPrefs(local_state); @@ -150,7 +152,7 @@ void RegisterUserPrefs(PrefService* user_prefs) { TemplateURLModel::RegisterUserPrefs(user_prefs); InstantController::RegisterUserPrefs(user_prefs); NetPrefObserver::RegisterPrefs(user_prefs); - policy::ProfilePolicyContext::RegisterUserPrefs(user_prefs); + policy::ProfilePolicyConnector::RegisterPrefs(user_prefs); ProtocolHandlerRegistry::RegisterPrefs(user_prefs); } diff --git a/chrome/browser/prefs/pref_member.h b/chrome/browser/prefs/pref_member.h index 977e1f1..1884edc 100644 --- a/chrome/browser/prefs/pref_member.h +++ b/chrome/browser/prefs/pref_member.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // @@ -192,6 +192,11 @@ class PrefMember : public subtle::PrefMemberBase { } } + // Returns the pref name. + const std::string& GetPrefName() const { + return pref_name(); + } + private: class Internal : public subtle::PrefMemberBase::Internal { public: |