diff options
31 files changed, 120 insertions, 64 deletions
diff --git a/chrome/browser/cocoa/preferences_window_controller.mm b/chrome/browser/cocoa/preferences_window_controller.mm index 841bafd..c7c2b7b 100644 --- a/chrome/browser/cocoa/preferences_window_controller.mm +++ b/chrome/browser/cocoa/preferences_window_controller.mm @@ -389,7 +389,7 @@ class PrefObserverBridge : public NotificationObserver, // Tracks state for a managed prefs banner and triggers UI updates through the // PreferencesWindowController as appropriate. -class ManagedPrefsBannerState : public ManagedPrefsBannerBase { +class ManagedPrefsBannerState : public policy::ManagedPrefsBannerBase { public: virtual ~ManagedPrefsBannerState() { } @@ -397,7 +397,7 @@ class ManagedPrefsBannerState : public ManagedPrefsBannerBase { OptionsPage page, PrefService* local_state, PrefService* prefs) - : ManagedPrefsBannerBase(local_state, prefs, page), + : policy::ManagedPrefsBannerBase(local_state, prefs, page), controller_(controller), page_(page) { } diff --git a/chrome/browser/dom_ui/options_managed_banner_handler.cc b/chrome/browser/dom_ui/options_managed_banner_handler.cc index c7e52c3..d3d9973 100644 --- a/chrome/browser/dom_ui/options_managed_banner_handler.cc +++ b/chrome/browser/dom_ui/options_managed_banner_handler.cc @@ -11,7 +11,7 @@ OptionsManagedBannerHandler::OptionsManagedBannerHandler( DOMUI* dom_ui, const string16& page_name, OptionsPage page) - : ManagedPrefsBannerBase(dom_ui->GetProfile()->GetPrefs(), page), + : policy::ManagedPrefsBannerBase(dom_ui->GetProfile()->GetPrefs(), page), dom_ui_(dom_ui), page_name_(page_name), page_(page) { // Initialize the visibility state of the banner. SetupBannerVisibilty(); @@ -34,4 +34,3 @@ void OptionsManagedBannerHandler::SetupBannerVisibilty() { // Set the managed state in the javascript handler. dom_ui_->CallJavascriptFunction(UTF16ToWideHack(script), visibility); } - diff --git a/chrome/browser/dom_ui/options_managed_banner_handler.h b/chrome/browser/dom_ui/options_managed_banner_handler.h index 7e62231..13d4c82 100644 --- a/chrome/browser/dom_ui/options_managed_banner_handler.h +++ b/chrome/browser/dom_ui/options_managed_banner_handler.h @@ -14,7 +14,7 @@ class DOMUI; // Managed options banner handler. // Controls the display of a banner if an options panel contains options // that are under administator control. -class OptionsManagedBannerHandler : public ManagedPrefsBannerBase { +class OptionsManagedBannerHandler : public policy::ManagedPrefsBannerBase { public: OptionsManagedBannerHandler(DOMUI* dom_ui, const string16& page_name, OptionsPage page); @@ -36,4 +36,3 @@ class OptionsManagedBannerHandler : public ManagedPrefsBannerBase { }; #endif // CHROME_BROWSER_DOM_UI_OPTIONS_MANAGED_BANNER_HANDLER_H_ - diff --git a/chrome/browser/gtk/options/managed_prefs_banner_gtk.cc b/chrome/browser/gtk/options/managed_prefs_banner_gtk.cc index ad03860..a402656 100644 --- a/chrome/browser/gtk/options/managed_prefs_banner_gtk.cc +++ b/chrome/browser/gtk/options/managed_prefs_banner_gtk.cc @@ -18,7 +18,7 @@ const int kBannerPadding = 3; ManagedPrefsBannerGtk::ManagedPrefsBannerGtk(PrefService* prefs, OptionsPage page) - : ManagedPrefsBannerBase(prefs, page), + : policy::ManagedPrefsBannerBase(prefs, page), banner_widget_(NULL) { InitWidget(); OnUpdateVisibility(); diff --git a/chrome/browser/gtk/options/managed_prefs_banner_gtk.h b/chrome/browser/gtk/options/managed_prefs_banner_gtk.h index 24301d7..cd7f9c6 100644 --- a/chrome/browser/gtk/options/managed_prefs_banner_gtk.h +++ b/chrome/browser/gtk/options/managed_prefs_banner_gtk.h @@ -13,7 +13,7 @@ // Constructs and maintains a GTK widget displaying a warning banner. The banner // is displayed on the preferences dialog whenever there are options that are // not settable by the user due to policy. -class ManagedPrefsBannerGtk : public ManagedPrefsBannerBase { +class ManagedPrefsBannerGtk : public policy::ManagedPrefsBannerBase { public: ManagedPrefsBannerGtk(PrefService* prefs, OptionsPage page); virtual ~ManagedPrefsBannerGtk() { } diff --git a/chrome/browser/net/chrome_url_request_context_unittest.cc b/chrome/browser/net/chrome_url_request_context_unittest.cc index 80b7578..3fe9d25 100644 --- a/chrome/browser/net/chrome_url_request_context_unittest.cc +++ b/chrome/browser/net/chrome_url_request_context_unittest.cc @@ -159,7 +159,7 @@ TEST(ChromeURLRequestContextTest, CreateProxyConfigTest) { tests[i].description.c_str())); CommandLine command_line(tests[i].command_line); PrefService prefs(new TestingPrefService::TestingPrefValueStore( - new ConfigurationPolicyPrefStore(&command_line, NULL), + new policy::ConfigurationPolicyPrefStore(&command_line, NULL), NULL, NULL, NULL, NULL)); // Only configuration-policy prefs. ChromeURLRequestContextGetter::RegisterUserPrefs(&prefs); scoped_ptr<net::ProxyConfig> config(CreateProxyConfig(&prefs)); @@ -174,4 +174,3 @@ TEST(ChromeURLRequestContextTest, CreateProxyConfigTest) { } } } - diff --git a/chrome/browser/policy/config_dir_policy_provider.cc b/chrome/browser/policy/config_dir_policy_provider.cc index 1890deb..5cfd040 100644 --- a/chrome/browser/policy/config_dir_policy_provider.cc +++ b/chrome/browser/policy/config_dir_policy_provider.cc @@ -15,7 +15,7 @@ #include "chrome/browser/chrome_thread.h" #include "chrome/common/json_value_serializer.h" -namespace { +namespace policy { // Amount of time we wait for the files in the policy directory to settle before // trying to load it. This alleviates the problem of reading partially written @@ -26,8 +26,6 @@ const int kSettleIntervalSeconds = 5; // directory watch fails or doesn't report a change. const int kReloadIntervalMinutes = 15; -} // namespace - // PolicyDirLoader implementation: PolicyDirLoader::PolicyDirLoader( @@ -269,3 +267,5 @@ void ConfigDirPolicyProvider::DecodePolicyValueTree( // TODO(mnissler): Handle preference overrides once |ConfigurationPolicyStore| // supports it. } + +} // namespace policy diff --git a/chrome/browser/policy/config_dir_policy_provider.h b/chrome/browser/policy/config_dir_policy_provider.h index cb4e1a1..18c97cf 100644 --- a/chrome/browser/policy/config_dir_policy_provider.h +++ b/chrome/browser/policy/config_dir_policy_provider.h @@ -17,10 +17,13 @@ #include "chrome/browser/policy/configuration_policy_provider.h" class CancelableTask; -class ConfigDirPolicyProvider; class DictionaryValue; class MessageLoop; +namespace policy { + +class ConfigDirPolicyProvider; + // FilePathWatcher delegate implementation that handles change notifications for // the configuration directory. It keeps the authorative version of the // currently effective policy dictionary and updates it as appropriate. @@ -165,4 +168,6 @@ class ConfigDirPolicyProvider DISALLOW_COPY_AND_ASSIGN(ConfigDirPolicyProvider); }; +} // namespace policy + #endif // CHROME_BROWSER_POLICY_CONFIG_DIR_POLICY_PROVIDER_H_ diff --git a/chrome/browser/policy/config_dir_policy_provider_unittest.cc b/chrome/browser/policy/config_dir_policy_provider_unittest.cc index 4cb0171..93a7b77 100644 --- a/chrome/browser/policy/config_dir_policy_provider_unittest.cc +++ b/chrome/browser/policy/config_dir_policy_provider_unittest.cc @@ -13,14 +13,12 @@ using testing::Mock; -namespace { +namespace policy { // Shorter reload intervals for testing PolicyDirWatcher. const int kSettleIntervalSecondsForTesting = 0; const int kReloadIntervalMinutesForTesting = 1; -} // namespace - class ConfigDirPolicyProviderTestBase : public testing::Test { protected: ConfigDirPolicyProviderTestBase() @@ -217,3 +215,5 @@ TEST_F(ConfigDirPolicyProviderTest, ReadPrefsMergePrefs) { EXPECT_TRUE(entry->second->GetAsString(&str_value)); EXPECT_EQ("http://foo.com", str_value); } + +} // namespace policy diff --git a/chrome/browser/policy/configuration_policy_pref_store.cc b/chrome/browser/policy/configuration_policy_pref_store.cc index 813b58a..126b037 100644 --- a/chrome/browser/policy/configuration_policy_pref_store.cc +++ b/chrome/browser/policy/configuration_policy_pref_store.cc @@ -25,7 +25,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" -namespace { +namespace policy { // Manages the lifecycle of the shared platform-specific policy providers // for managed and recommended policy. Instantiated as a Singleton. @@ -84,8 +84,6 @@ class ConfigurationPolicyProviderKeeper { DISALLOW_COPY_AND_ASSIGN(ConfigurationPolicyProviderKeeper); }; -} - const ConfigurationPolicyPrefStore::PolicyToPreferenceMapEntry ConfigurationPolicyPrefStore::simple_policy_map_[] = { { Value::TYPE_STRING, kPolicyHomePage, prefs::kHomePage }, @@ -392,3 +390,5 @@ void ConfigurationPolicyPrefStore::Apply(PolicyType policy, Value* value) { NOTIMPLEMENTED(); delete value; } + +} // namespace policy diff --git a/chrome/browser/policy/configuration_policy_pref_store.h b/chrome/browser/policy/configuration_policy_pref_store.h index 2b56172..b28d5eb 100644 --- a/chrome/browser/policy/configuration_policy_pref_store.h +++ b/chrome/browser/policy/configuration_policy_pref_store.h @@ -16,6 +16,8 @@ class CommandLine; +namespace policy { + // An implementation of the |PrefStore| that holds a Dictionary // created through applied policy. class ConfigurationPolicyPrefStore : public PrefStore, @@ -101,4 +103,6 @@ class ConfigurationPolicyPrefStore : public PrefStore, DISALLOW_COPY_AND_ASSIGN(ConfigurationPolicyPrefStore); }; +} // namespace policy + #endif // CHROME_BROWSER_POLICY_CONFIGURATION_POLICY_PREF_STORE_H_ diff --git a/chrome/browser/policy/configuration_policy_pref_store_unittest.cc b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc index 1b9dca3..7dae74b 100644 --- a/chrome/browser/policy/configuration_policy_pref_store_unittest.cc +++ b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc @@ -11,6 +11,8 @@ #include "chrome/common/pref_names.h" #include "chrome/common/chrome_switches.h" +namespace policy { + class ConfigurationPolicyPrefStoreTest : public testing::Test { public: // Applies a policy that has a string value. @@ -462,3 +464,5 @@ TEST_F(ConfigurationPolicyPrefStoreTest, EXPECT_FALSE(store.prefs()->GetBoolean(prefs::kProxyAutoDetect, &bool_result)); } + +} // namespace policy diff --git a/chrome/browser/policy/configuration_policy_provider.cc b/chrome/browser/policy/configuration_policy_provider.cc index b63765e..3734af2 100644 --- a/chrome/browser/policy/configuration_policy_provider.cc +++ b/chrome/browser/policy/configuration_policy_provider.cc @@ -8,7 +8,7 @@ #include "chrome/common/policy_constants.h" #include "chrome/common/notification_service.h" -namespace { +namespace policy { // TODO(avi): Generate this mapping from the template metafile // (chrome/app/policy/policy_templates.json). http://crbug.com/54711 @@ -21,55 +21,53 @@ struct InternalPolicyValueMapEntry { const InternalPolicyValueMapEntry kPolicyValueMap[] = { { ConfigurationPolicyStore::kPolicyHomePage, - Value::TYPE_STRING, policy::key::kHomepageLocation }, + Value::TYPE_STRING, key::kHomepageLocation }, { ConfigurationPolicyStore::kPolicyHomepageIsNewTabPage, - Value::TYPE_BOOLEAN, policy::key::kHomepageIsNewTabPage }, + Value::TYPE_BOOLEAN, key::kHomepageIsNewTabPage }, { ConfigurationPolicyStore::kPolicyRestoreOnStartup, - Value::TYPE_INTEGER, policy::key::kRestoreOnStartup }, + Value::TYPE_INTEGER, key::kRestoreOnStartup }, { ConfigurationPolicyStore::kPolicyURLsToRestoreOnStartup, - Value::TYPE_LIST, policy::key::kURLsToRestoreOnStartup }, + Value::TYPE_LIST, key::kURLsToRestoreOnStartup }, { ConfigurationPolicyStore::kPolicyProxyServerMode, - Value::TYPE_INTEGER, policy::key::kProxyServerMode }, + Value::TYPE_INTEGER, key::kProxyServerMode }, { ConfigurationPolicyStore::kPolicyProxyServer, - Value::TYPE_STRING, policy::key::kProxyServer }, + Value::TYPE_STRING, key::kProxyServer }, { ConfigurationPolicyStore::kPolicyProxyPacUrl, - Value::TYPE_STRING, policy::key::kProxyPacUrl }, + Value::TYPE_STRING, key::kProxyPacUrl }, { ConfigurationPolicyStore::kPolicyProxyBypassList, - Value::TYPE_STRING, policy::key::kProxyBypassList }, + Value::TYPE_STRING, key::kProxyBypassList }, { ConfigurationPolicyStore::kPolicyAlternateErrorPagesEnabled, - Value::TYPE_BOOLEAN, policy::key::kAlternateErrorPagesEnabled }, + Value::TYPE_BOOLEAN, key::kAlternateErrorPagesEnabled }, { ConfigurationPolicyStore::kPolicySearchSuggestEnabled, - Value::TYPE_BOOLEAN, policy::key::kSearchSuggestEnabled }, + Value::TYPE_BOOLEAN, key::kSearchSuggestEnabled }, { ConfigurationPolicyStore::kPolicyDnsPrefetchingEnabled, - Value::TYPE_BOOLEAN, policy::key::kDnsPrefetchingEnabled }, + Value::TYPE_BOOLEAN, key::kDnsPrefetchingEnabled }, { ConfigurationPolicyStore::kPolicySafeBrowsingEnabled, - Value::TYPE_BOOLEAN, policy::key::kSafeBrowsingEnabled }, + Value::TYPE_BOOLEAN, key::kSafeBrowsingEnabled }, { ConfigurationPolicyStore::kPolicyMetricsReportingEnabled, - Value::TYPE_BOOLEAN, policy::key::kMetricsReportingEnabled }, + Value::TYPE_BOOLEAN, key::kMetricsReportingEnabled }, { ConfigurationPolicyStore::kPolicyPasswordManagerEnabled, - Value::TYPE_BOOLEAN, policy::key::kPasswordManagerEnabled }, + Value::TYPE_BOOLEAN, key::kPasswordManagerEnabled }, { ConfigurationPolicyStore::kPolicyPasswordManagerAllowShowPasswords, - Value::TYPE_BOOLEAN, policy::key::kPasswordManagerAllowShowPasswords }, + Value::TYPE_BOOLEAN, key::kPasswordManagerAllowShowPasswords }, { ConfigurationPolicyStore::kPolicyAutoFillEnabled, - Value::TYPE_BOOLEAN, policy::key::kAutoFillEnabled }, + Value::TYPE_BOOLEAN, key::kAutoFillEnabled }, { ConfigurationPolicyStore::kPolicyDisabledPlugins, - Value::TYPE_LIST, policy::key::kDisabledPlugins }, + Value::TYPE_LIST, key::kDisabledPlugins }, { ConfigurationPolicyStore::kPolicyApplicationLocale, - Value::TYPE_STRING, policy::key::kApplicationLocaleValue }, + Value::TYPE_STRING, key::kApplicationLocaleValue }, { ConfigurationPolicyStore::kPolicySyncDisabled, - Value::TYPE_BOOLEAN, policy::key::kSyncDisabled }, + Value::TYPE_BOOLEAN, key::kSyncDisabled }, { ConfigurationPolicyStore::kPolicyExtensionInstallAllowList, - Value::TYPE_LIST, policy::key::kExtensionInstallAllowList }, + Value::TYPE_LIST, key::kExtensionInstallAllowList }, { ConfigurationPolicyStore::kPolicyExtensionInstallDenyList, - Value::TYPE_LIST, policy::key::kExtensionInstallDenyList }, + Value::TYPE_LIST, key::kExtensionInstallDenyList }, { ConfigurationPolicyStore::kPolicyShowHomeButton, - Value::TYPE_BOOLEAN, policy::key::kShowHomeButton }, + Value::TYPE_BOOLEAN, key::kShowHomeButton }, { ConfigurationPolicyStore::kPolicyPrintingEnabled, - Value::TYPE_BOOLEAN, policy::key::kPrintingEnabled }, + Value::TYPE_BOOLEAN, key::kPrintingEnabled }, }; -} // namespace - /* static */ const ConfigurationPolicyProvider::PolicyValueMap* ConfigurationPolicyProvider::PolicyValueMapping() { @@ -94,3 +92,5 @@ void ConfigurationPolicyProvider::NotifyStoreOfPolicyChange() { Source<ConfigurationPolicyProvider>(this), NotificationService::NoDetails()); } + +} // namespace policy diff --git a/chrome/browser/policy/configuration_policy_provider.h b/chrome/browser/policy/configuration_policy_provider.h index a0802e8..558530d 100644 --- a/chrome/browser/policy/configuration_policy_provider.h +++ b/chrome/browser/policy/configuration_policy_provider.h @@ -12,6 +12,8 @@ #include "base/values.h" #include "chrome/browser/policy/configuration_policy_store.h" +namespace policy { + // A mostly-abstract super class for platform-specific policy providers. // Platform-specific policy providers (Windows Group Policy, gconf, // etc.) should implement a subclass of this class. @@ -51,4 +53,6 @@ class ConfigurationPolicyProvider { DISALLOW_COPY_AND_ASSIGN(ConfigurationPolicyProvider); }; +} // namespace policy + #endif // CHROME_BROWSER_POLICY_CONFIGURATION_POLICY_PROVIDER_H_ diff --git a/chrome/browser/policy/configuration_policy_provider_mac.cc b/chrome/browser/policy/configuration_policy_provider_mac.cc index 2f1d897..94c6f68 100644 --- a/chrome/browser/policy/configuration_policy_provider_mac.cc +++ b/chrome/browser/policy/configuration_policy_provider_mac.cc @@ -8,6 +8,8 @@ #include "base/scoped_cftyperef.h" #include "base/sys_string_conversions.h" +namespace policy { + ConfigurationPolicyProviderMac::ConfigurationPolicyProviderMac() : preferences_(new MacPreferences()) { } @@ -101,3 +103,4 @@ bool ConfigurationPolicyProviderMac::Provide(ConfigurationPolicyStore* store) { return success; } +} // namespace policy diff --git a/chrome/browser/policy/configuration_policy_provider_mac.h b/chrome/browser/policy/configuration_policy_provider_mac.h index ab24473..3ec73fa 100644 --- a/chrome/browser/policy/configuration_policy_provider_mac.h +++ b/chrome/browser/policy/configuration_policy_provider_mac.h @@ -11,6 +11,8 @@ #include "chrome/browser/policy/configuration_policy_provider.h" #include "chrome/browser/preferences_mac.h" +namespace policy { + // An implementation of |ConfigurationPolicyProvider| using the mechanism // provided by Mac OS X's managed preferences. class ConfigurationPolicyProviderMac : public ConfigurationPolicyProvider { @@ -27,5 +29,6 @@ class ConfigurationPolicyProviderMac : public ConfigurationPolicyProvider { scoped_ptr<MacPreferences> preferences_; }; -#endif // CHROME_BROWSER_POLICY_CONFIGURATION_POLICY_PROVIDER_MAC_H_ +} // namespace policy +#endif // CHROME_BROWSER_POLICY_CONFIGURATION_POLICY_PROVIDER_MAC_H_ diff --git a/chrome/browser/policy/configuration_policy_provider_mac_unittest.cc b/chrome/browser/policy/configuration_policy_provider_mac_unittest.cc index f521d7f..d6b9207 100644 --- a/chrome/browser/policy/configuration_policy_provider_mac_unittest.cc +++ b/chrome/browser/policy/configuration_policy_provider_mac_unittest.cc @@ -10,6 +10,8 @@ #include "chrome/browser/policy/mock_configuration_policy_store.h" #include "chrome/browser/preferences_mock_mac.h" +namespace policy { + // A subclass of |ConfigurationPolicyProviderMac| providing access to various // internal things without an orgy of FRIEND_TESTS. class TestConfigurationPolicyProviderMac @@ -147,3 +149,4 @@ TEST(ConfigurationPolicyProviderMacTest, TestExtensionInstallBlacklist) { EXPECT_STREQ("def", str_value.c_str()); } +} // namespace policy diff --git a/chrome/browser/policy/configuration_policy_provider_win.cc b/chrome/browser/policy/configuration_policy_provider_win.cc index 284ca9d..c4cb04c 100644 --- a/chrome/browser/policy/configuration_policy_provider_win.cc +++ b/chrome/browser/policy/configuration_policy_provider_win.cc @@ -20,14 +20,12 @@ #include "base/values.h" #include "chrome/common/policy_constants.h" -namespace { +namespace policy { // Period at which to run the reload task in case the group policy change // watchers fail. const int kReloadIntervalMinutes = 15; -} - ConfigurationPolicyProviderWin::GroupPolicyChangeWatcher:: GroupPolicyChangeWatcher( base::WeakPtr<ConfigurationPolicyProviderWin> provider, @@ -141,7 +139,7 @@ ConfigurationPolicyProviderWin::~ConfigurationPolicyProviderWin() { bool ConfigurationPolicyProviderWin::GetRegistryPolicyString( const string16& name, string16* result) { - string16 path = string16(policy::kRegistrySubKey); + string16 path = string16(kRegistrySubKey); RegKey policy_key; // First try the global policy. if (policy_key.Open(HKEY_LOCAL_MACHINE, path.c_str(), KEY_READ)) { @@ -179,7 +177,7 @@ bool ConfigurationPolicyProviderWin::ReadRegistryStringValue( bool ConfigurationPolicyProviderWin::GetRegistryPolicyStringList( const string16& key, ListValue* result) { - string16 path = string16(policy::kRegistrySubKey); + string16 path = string16(kRegistrySubKey); path += ASCIIToUTF16("\\") + key; RegKey policy_key; if (!policy_key.Open(HKEY_LOCAL_MACHINE, path.c_str(), KEY_READ)) { @@ -200,13 +198,13 @@ bool ConfigurationPolicyProviderWin::GetRegistryPolicyStringList( bool ConfigurationPolicyProviderWin::GetRegistryPolicyBoolean( const string16& value_name, bool* result) { DWORD value; - RegKey hkcu_policy_key(HKEY_LOCAL_MACHINE, policy::kRegistrySubKey, KEY_READ); + RegKey hkcu_policy_key(HKEY_LOCAL_MACHINE, kRegistrySubKey, KEY_READ); if (hkcu_policy_key.ReadValueDW(value_name.c_str(), &value)) { *result = value != 0; return true; } - RegKey hklm_policy_key(HKEY_CURRENT_USER, policy::kRegistrySubKey, KEY_READ); + RegKey hklm_policy_key(HKEY_CURRENT_USER, kRegistrySubKey, KEY_READ); if (hklm_policy_key.ReadValueDW(value_name.c_str(), &value)) { *result = value != 0; return true; @@ -217,13 +215,13 @@ bool ConfigurationPolicyProviderWin::GetRegistryPolicyBoolean( bool ConfigurationPolicyProviderWin::GetRegistryPolicyInteger( const string16& value_name, uint32* result) { DWORD value; - RegKey hkcu_policy_key(HKEY_LOCAL_MACHINE, policy::kRegistrySubKey, KEY_READ); + RegKey hkcu_policy_key(HKEY_LOCAL_MACHINE, kRegistrySubKey, KEY_READ); if (hkcu_policy_key.ReadValueDW(value_name.c_str(), &value)) { *result = value; return true; } - RegKey hklm_policy_key(HKEY_CURRENT_USER, policy::kRegistrySubKey, KEY_READ); + RegKey hklm_policy_key(HKEY_CURRENT_USER, kRegistrySubKey, KEY_READ); if (hklm_policy_key.ReadValueDW(value_name.c_str(), &value)) { *result = value; return true; @@ -277,3 +275,5 @@ bool ConfigurationPolicyProviderWin::Provide( return true; } + +} // namespace policy diff --git a/chrome/browser/policy/configuration_policy_provider_win.h b/chrome/browser/policy/configuration_policy_provider_win.h index ea10aea..1726e74 100644 --- a/chrome/browser/policy/configuration_policy_provider_win.h +++ b/chrome/browser/policy/configuration_policy_provider_win.h @@ -16,6 +16,8 @@ class RegKey; +namespace policy { + // An implementation of |ConfigurationPolicyProvider| using the // mechanism provided by Windows Groups Policy. Policy decisions are // stored as values in a special section of the Windows Registry. @@ -106,4 +108,6 @@ class ConfigurationPolicyProviderWin bool GetRegistryPolicyInteger(const string16& value_name, uint32* result); }; +} // namespace policy + #endif // CHROME_BROWSER_POLICY_CONFIGURATION_POLICY_PROVIDER_WIN_H_ diff --git a/chrome/browser/policy/configuration_policy_provider_win_unittest.cc b/chrome/browser/policy/configuration_policy_provider_win_unittest.cc index aecb1ff..9149635 100644 --- a/chrome/browser/policy/configuration_policy_provider_win_unittest.cc +++ b/chrome/browser/policy/configuration_policy_provider_win_unittest.cc @@ -17,7 +17,7 @@ #include "chrome/common/policy_constants.h" #include "chrome/common/pref_names.h" -namespace { +namespace policy { const wchar_t kUnitTestRegistrySubKey[] = L"SOFTWARE\\Chromium Unit Tests"; const wchar_t kUnitTestMachineOverrideSubKey[] = @@ -25,8 +25,6 @@ const wchar_t kUnitTestMachineOverrideSubKey[] = const wchar_t kUnitTestUserOverrideSubKey[] = L"SOFTWARE\\Chromium Unit Tests\\HKCU Override"; -} // namespace - // A subclass of |ConfigurationPolicyProviderWin| providing access to // internal protected constants without an orgy of FRIEND_TESTS. class TestConfigurationPolicyProviderWin @@ -435,3 +433,5 @@ TEST_F(ConfigurationPolicyProviderWinTest, TestPolicyPasswordManagerEnabled) { TestBooleanPolicy(ConfigurationPolicyStore::kPolicyPasswordManagerEnabled); } + +} // namespace policy diff --git a/chrome/browser/policy/configuration_policy_store.h b/chrome/browser/policy/configuration_policy_store.h index ee7d1262..b714bb6 100644 --- a/chrome/browser/policy/configuration_policy_store.h +++ b/chrome/browser/policy/configuration_policy_store.h @@ -10,6 +10,8 @@ class Value; +namespace policy { + // An abstract super class for policy stores that provides a method that can be // called by a |ConfigurationPolicyProvider| to specify a policy. class ConfigurationPolicyStore { @@ -60,4 +62,6 @@ class ConfigurationPolicyStore { DISALLOW_COPY_AND_ASSIGN(ConfigurationPolicyStore); }; +} // namespace policy + #endif // CHROME_BROWSER_POLICY_CONFIGURATION_POLICY_STORE_H_ diff --git a/chrome/browser/policy/dummy_configuration_policy_provider.h b/chrome/browser/policy/dummy_configuration_policy_provider.h index 9309c00..e850d4b 100644 --- a/chrome/browser/policy/dummy_configuration_policy_provider.h +++ b/chrome/browser/policy/dummy_configuration_policy_provider.h @@ -9,6 +9,8 @@ #include "chrome/browser/policy/configuration_policy_store.h" #include "chrome/browser/policy/configuration_policy_provider.h" +namespace policy { + class DummyConfigurationPolicyProvider : public ConfigurationPolicyProvider { public: DummyConfigurationPolicyProvider() {} @@ -22,5 +24,6 @@ class DummyConfigurationPolicyProvider : public ConfigurationPolicyProvider { DISALLOW_COPY_AND_ASSIGN(DummyConfigurationPolicyProvider); }; -#endif // CHROME_BROWSER_POLICY_DUMMY_CONFIGURATION_POLICY_PROVIDER_H_ +} // namespace policy +#endif // CHROME_BROWSER_POLICY_DUMMY_CONFIGURATION_POLICY_PROVIDER_H_ diff --git a/chrome/browser/policy/managed_prefs_banner_base.cc b/chrome/browser/policy/managed_prefs_banner_base.cc index b9d4d83..3b2ffc0 100644 --- a/chrome/browser/policy/managed_prefs_banner_base.cc +++ b/chrome/browser/policy/managed_prefs_banner_base.cc @@ -10,6 +10,8 @@ #include "chrome/common/notification_type.h" #include "chrome/common/pref_names.h" +namespace policy { + ManagedPrefsBannerBase::ManagedPrefsBannerBase(PrefService* user_prefs, OptionsPage page) { Init(g_browser_process->local_state(), user_prefs, page); @@ -89,3 +91,5 @@ void ManagedPrefsBannerBase::Observe(NotificationType type, OnUpdateVisibility(); } } + +} // namespace policy diff --git a/chrome/browser/policy/managed_prefs_banner_base.h b/chrome/browser/policy/managed_prefs_banner_base.h index eb5bf90..e175175 100644 --- a/chrome/browser/policy/managed_prefs_banner_base.h +++ b/chrome/browser/policy/managed_prefs_banner_base.h @@ -14,6 +14,8 @@ class PrefService; +namespace policy { + // Common base functionality for the managed prefs warning banner displayed in // the preference dialogs when there are options that are controlled by // configuration policy and thus cannot be changed by the user. @@ -65,4 +67,7 @@ class ManagedPrefsBannerBase : public NotificationObserver { DISALLOW_COPY_AND_ASSIGN(ManagedPrefsBannerBase); }; + +} // namespace policy + #endif // CHROME_BROWSER_POLICY_MANAGED_PREFS_BANNER_BASE_H_ diff --git a/chrome/browser/policy/managed_prefs_banner_base_unittest.cc b/chrome/browser/policy/managed_prefs_banner_base_unittest.cc index 7bf3977..35425b14 100644 --- a/chrome/browser/policy/managed_prefs_banner_base_unittest.cc +++ b/chrome/browser/policy/managed_prefs_banner_base_unittest.cc @@ -9,6 +9,8 @@ #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" +namespace policy { + // Tests whether managed preferences banner base functionality correctly // determines banner visiblity. class ManagedPrefsBannerBaseTest : public testing::Test { @@ -78,3 +80,5 @@ TEST_F(ManagedPrefsBannerBaseTest, NotificationTest) { local_state_->SetManagedPref(prefs::kMetricsReportingEnabled, Value::CreateBooleanValue(true)); } + +} // namespace policy diff --git a/chrome/browser/policy/mock_configuration_policy_provider.h b/chrome/browser/policy/mock_configuration_policy_provider.h index 2d727467..670adc3 100644 --- a/chrome/browser/policy/mock_configuration_policy_provider.h +++ b/chrome/browser/policy/mock_configuration_policy_provider.h @@ -11,6 +11,8 @@ #include "base/stl_util-inl.h" #include "chrome/browser/policy/configuration_policy_provider.h" +namespace policy { + // Mock ConfigurationPolicyProvider implementation that supplies canned // values for polices. class MockConfigurationPolicyProvider : public ConfigurationPolicyProvider { @@ -39,5 +41,6 @@ class MockConfigurationPolicyProvider : public ConfigurationPolicyProvider { PolicyMap policy_map_; }; -#endif // CHROME_BROWSER_POLICY_MOCK_CONFIGURATION_POLICY_PROVIDER_H_ +} // namespace policy +#endif // CHROME_BROWSER_POLICY_MOCK_CONFIGURATION_POLICY_PROVIDER_H_ diff --git a/chrome/browser/policy/mock_configuration_policy_store.h b/chrome/browser/policy/mock_configuration_policy_store.h index c1ab12d..7e2f834 100644 --- a/chrome/browser/policy/mock_configuration_policy_store.h +++ b/chrome/browser/policy/mock_configuration_policy_store.h @@ -11,6 +11,8 @@ #include "base/stl_util-inl.h" #include "chrome/browser/policy/configuration_policy_store.h" +namespace policy { + // Mock ConfigurationPolicyStore implementation that records values for policy // settings as they get set. class MockConfigurationPolicyStore : public ConfigurationPolicyStore { @@ -32,4 +34,6 @@ class MockConfigurationPolicyStore : public ConfigurationPolicyStore { PolicyMap policy_map_; }; +} // namespace policy + #endif // CHROME_BROWSER_POLICY_MOCK_CONFIGURATION_POLICY_STORE_H_ diff --git a/chrome/browser/prefs/pref_notifier.cc b/chrome/browser/prefs/pref_notifier.cc index 665bffb..f779738 100644 --- a/chrome/browser/prefs/pref_notifier.cc +++ b/chrome/browser/prefs/pref_notifier.cc @@ -120,6 +120,8 @@ void PrefNotifier::FireObserversForRefreshedManagedPrefs( void PrefNotifier::Observe(NotificationType type, const NotificationSource& source, const NotificationDetails& details) { + using policy::ConfigurationPolicyPrefStore; + if (type == NotificationType::POLICY_CHANGED) { PrefValueStore::AfterRefreshCallback* callback = NewCallback(this, @@ -134,7 +136,6 @@ void PrefNotifier::Observe(NotificationType type, &PrefValueStore::RefreshPolicyPrefs, ConfigurationPolicyPrefStore::CreateManagedPolicyPrefStore(), ConfigurationPolicyPrefStore::CreateRecommendedPolicyPrefStore(), - callback)); } } diff --git a/chrome/browser/prefs/pref_value_store.cc b/chrome/browser/prefs/pref_value_store.cc index 501f1e1..911d8b4 100644 --- a/chrome/browser/prefs/pref_value_store.cc +++ b/chrome/browser/prefs/pref_value_store.cc @@ -17,6 +17,7 @@ PrefValueStore* PrefValueStore::CreatePrefValueStore( const FilePath& pref_filename, Profile* profile, bool user_only) { + using policy::ConfigurationPolicyPrefStore; ConfigurationPolicyPrefStore* managed = NULL; ExtensionPrefStore* extension = NULL; CommandLinePrefStore* command_line = NULL; diff --git a/chrome/browser/views/options/managed_prefs_banner_view.cc b/chrome/browser/views/options/managed_prefs_banner_view.cc index b3fc5f2..e063d14 100644 --- a/chrome/browser/views/options/managed_prefs_banner_view.cc +++ b/chrome/browser/views/options/managed_prefs_banner_view.cc @@ -20,7 +20,7 @@ static const int kPrefsBannerBorderSize = 1; ManagedPrefsBannerView::ManagedPrefsBannerView(PrefService* prefs, OptionsPage page) - : ManagedPrefsBannerBase(prefs, page) { + : policy::ManagedPrefsBannerBase(prefs, page) { content_ = new views::View; SkColor border_color = color_utils::GetSysSkColor(COLOR_3DSHADOW); views::Border* border = views::Border::CreateSolidBorder( diff --git a/chrome/browser/views/options/managed_prefs_banner_view.h b/chrome/browser/views/options/managed_prefs_banner_view.h index 77ceea8..f34ab30 100644 --- a/chrome/browser/views/options/managed_prefs_banner_view.h +++ b/chrome/browser/views/options/managed_prefs_banner_view.h @@ -17,7 +17,7 @@ class Label; // Displays a banner showing a warning message that tells the user some options // cannot be changed because the relevant preferences are managed by their // system administrator. -class ManagedPrefsBannerView : public ManagedPrefsBannerBase, +class ManagedPrefsBannerView : public policy::ManagedPrefsBannerBase, public views::View { public: // Initialize the banner. |page| is used to determine the names of the |