| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/policy/configuration_policy_pref_store.h" | 5 #include "chrome/browser/policy/configuration_policy_pref_store.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| 11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
| 12 #include "base/lazy_instance.h" | 12 #include "base/lazy_instance.h" |
| 13 #include "base/logging.h" | 13 #include "base/logging.h" |
| 14 #include "base/path_service.h" | 14 #include "base/path_service.h" |
| 15 #include "base/stl_util-inl.h" | 15 #include "base/stl_util-inl.h" |
| 16 #include "base/string16.h" | 16 #include "base/string16.h" |
| 17 #include "base/string_util.h" | 17 #include "base/string_util.h" |
| 18 #include "base/utf_string_conversions.h" | 18 #include "base/utf_string_conversions.h" |
| 19 #include "base/values.h" | 19 #include "base/values.h" |
| 20 #include "chrome/browser/policy/configuration_policy_provider.h" | 20 #include "chrome/browser/policy/configuration_policy_provider.h" |
| 21 #if defined(OS_WIN) | 21 #if defined(OS_WIN) |
| 22 #include "chrome/browser/policy/configuration_policy_provider_win.h" | 22 #include "chrome/browser/policy/configuration_policy_provider_win.h" |
| 23 #elif defined(OS_MACOSX) | 23 #elif defined(OS_MACOSX) |
| 24 #include "chrome/browser/policy/configuration_policy_provider_mac.h" | 24 #include "chrome/browser/policy/configuration_policy_provider_mac.h" |
| 25 #elif defined(OS_POSIX) | 25 #elif defined(OS_POSIX) |
| 26 #include "chrome/browser/policy/config_dir_policy_provider.h" | 26 #include "chrome/browser/policy/config_dir_policy_provider.h" |
| 27 #endif | 27 #endif |
| 28 #include "chrome/browser/policy/configuration_policy_type.h" |
| 28 #include "chrome/browser/policy/device_management_policy_provider.h" | 29 #include "chrome/browser/policy/device_management_policy_provider.h" |
| 29 #include "chrome/browser/policy/dummy_configuration_policy_provider.h" | 30 #include "chrome/browser/policy/dummy_configuration_policy_provider.h" |
| 30 #include "chrome/browser/policy/profile_policy_context.h" | 31 #include "chrome/browser/policy/profile_policy_context.h" |
| 31 #include "chrome/browser/prefs/pref_value_map.h" | 32 #include "chrome/browser/prefs/pref_value_map.h" |
| 32 #include "chrome/browser/prefs/proxy_prefs.h" | 33 #include "chrome/browser/prefs/proxy_prefs.h" |
| 33 #include "chrome/browser/profiles/profile.h" | 34 #include "chrome/browser/profiles/profile.h" |
| 34 #include "chrome/browser/search_engines/search_terms_data.h" | 35 #include "chrome/browser/search_engines/search_terms_data.h" |
| 35 #include "chrome/browser/search_engines/template_url.h" | 36 #include "chrome/browser/search_engines/template_url.h" |
| 36 #include "chrome/common/chrome_paths.h" | 37 #include "chrome/common/chrome_paths.h" |
| 37 #include "chrome/common/chrome_switches.h" | 38 #include "chrome/common/chrome_switches.h" |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 | 151 |
| 151 static const PolicyToPreferenceMapEntry kSimplePolicyMap[]; | 152 static const PolicyToPreferenceMapEntry kSimplePolicyMap[]; |
| 152 static const PolicyToPreferenceMapEntry kProxyPolicyMap[]; | 153 static const PolicyToPreferenceMapEntry kProxyPolicyMap[]; |
| 153 static const PolicyToPreferenceMapEntry kDefaultSearchPolicyMap[]; | 154 static const PolicyToPreferenceMapEntry kDefaultSearchPolicyMap[]; |
| 154 | 155 |
| 155 DISALLOW_COPY_AND_ASSIGN(ConfigurationPolicyPrefKeeper); | 156 DISALLOW_COPY_AND_ASSIGN(ConfigurationPolicyPrefKeeper); |
| 156 }; | 157 }; |
| 157 | 158 |
| 158 const ConfigurationPolicyPrefKeeper::PolicyToPreferenceMapEntry | 159 const ConfigurationPolicyPrefKeeper::PolicyToPreferenceMapEntry |
| 159 ConfigurationPolicyPrefKeeper::kSimplePolicyMap[] = { | 160 ConfigurationPolicyPrefKeeper::kSimplePolicyMap[] = { |
| 160 { Value::TYPE_STRING, kPolicyHomePage, prefs::kHomePage }, | 161 { Value::TYPE_STRING, kPolicyHomepageLocation, prefs::kHomePage }, |
| 161 { Value::TYPE_BOOLEAN, kPolicyHomepageIsNewTabPage, | 162 { Value::TYPE_BOOLEAN, kPolicyHomepageIsNewTabPage, |
| 162 prefs::kHomePageIsNewTabPage }, | 163 prefs::kHomePageIsNewTabPage }, |
| 163 { Value::TYPE_INTEGER, kPolicyRestoreOnStartup, | 164 { Value::TYPE_INTEGER, kPolicyRestoreOnStartup, |
| 164 prefs::kRestoreOnStartup}, | 165 prefs::kRestoreOnStartup}, |
| 165 { Value::TYPE_LIST, kPolicyURLsToRestoreOnStartup, | 166 { Value::TYPE_LIST, kPolicyRestoreOnStartupURLs, |
| 166 prefs::kURLsToRestoreOnStartup }, | 167 prefs::kURLsToRestoreOnStartup }, |
| 167 { Value::TYPE_BOOLEAN, kPolicyAlternateErrorPagesEnabled, | 168 { Value::TYPE_BOOLEAN, kPolicyAlternateErrorPagesEnabled, |
| 168 prefs::kAlternateErrorPagesEnabled }, | 169 prefs::kAlternateErrorPagesEnabled }, |
| 169 { Value::TYPE_BOOLEAN, kPolicySearchSuggestEnabled, | 170 { Value::TYPE_BOOLEAN, kPolicySearchSuggestEnabled, |
| 170 prefs::kSearchSuggestEnabled }, | 171 prefs::kSearchSuggestEnabled }, |
| 171 { Value::TYPE_BOOLEAN, kPolicyDnsPrefetchingEnabled, | 172 { Value::TYPE_BOOLEAN, kPolicyDnsPrefetchingEnabled, |
| 172 prefs::kDnsPrefetchingEnabled }, | 173 prefs::kDnsPrefetchingEnabled }, |
| 173 { Value::TYPE_BOOLEAN, kPolicyDisableSpdy, | 174 { Value::TYPE_BOOLEAN, kPolicyDisableSpdy, |
| 174 prefs::kDisableSpdy }, | 175 prefs::kDisableSpdy }, |
| 175 { Value::TYPE_BOOLEAN, kPolicySafeBrowsingEnabled, | 176 { Value::TYPE_BOOLEAN, kPolicySafeBrowsingEnabled, |
| 176 prefs::kSafeBrowsingEnabled }, | 177 prefs::kSafeBrowsingEnabled }, |
| 177 { Value::TYPE_BOOLEAN, kPolicyPasswordManagerEnabled, | 178 { Value::TYPE_BOOLEAN, kPolicyPasswordManagerEnabled, |
| 178 prefs::kPasswordManagerEnabled }, | 179 prefs::kPasswordManagerEnabled }, |
| 179 { Value::TYPE_BOOLEAN, kPolicyPasswordManagerAllowShowPasswords, | 180 { Value::TYPE_BOOLEAN, kPolicyPasswordManagerAllowShowPasswords, |
| 180 prefs::kPasswordManagerAllowShowPasswords }, | 181 prefs::kPasswordManagerAllowShowPasswords }, |
| 181 { Value::TYPE_BOOLEAN, kPolicyPrintingEnabled, | 182 { Value::TYPE_BOOLEAN, kPolicyPrintingEnabled, |
| 182 prefs::kPrintingEnabled }, | 183 prefs::kPrintingEnabled }, |
| 183 { Value::TYPE_BOOLEAN, kPolicyMetricsReportingEnabled, | 184 { Value::TYPE_BOOLEAN, kPolicyMetricsReportingEnabled, |
| 184 prefs::kMetricsReportingEnabled }, | 185 prefs::kMetricsReportingEnabled }, |
| 185 { Value::TYPE_STRING, kPolicyApplicationLocale, | 186 { Value::TYPE_STRING, kPolicyApplicationLocaleValue, |
| 186 prefs::kApplicationLocale}, | 187 prefs::kApplicationLocale}, |
| 187 { Value::TYPE_LIST, kPolicyExtensionInstallAllowList, | 188 { Value::TYPE_LIST, kPolicyExtensionInstallWhitelist, |
| 188 prefs::kExtensionInstallAllowList}, | 189 prefs::kExtensionInstallAllowList}, |
| 189 { Value::TYPE_LIST, kPolicyExtensionInstallDenyList, | 190 { Value::TYPE_LIST, kPolicyExtensionInstallBlacklist, |
| 190 prefs::kExtensionInstallDenyList}, | 191 prefs::kExtensionInstallDenyList}, |
| 191 { Value::TYPE_LIST, kPolicyExtensionInstallForceList, | 192 { Value::TYPE_LIST, kPolicyExtensionInstallForcelist, |
| 192 prefs::kExtensionInstallForceList}, | 193 prefs::kExtensionInstallForceList}, |
| 193 { Value::TYPE_LIST, kPolicyDisabledPlugins, | 194 { Value::TYPE_LIST, kPolicyDisabledPlugins, |
| 194 prefs::kPluginsPluginsBlacklist}, | 195 prefs::kPluginsPluginsBlacklist}, |
| 195 { Value::TYPE_BOOLEAN, kPolicyShowHomeButton, | 196 { Value::TYPE_BOOLEAN, kPolicyShowHomeButton, |
| 196 prefs::kShowHomeButton }, | 197 prefs::kShowHomeButton }, |
| 197 { Value::TYPE_BOOLEAN, kPolicyJavascriptEnabled, | 198 { Value::TYPE_BOOLEAN, kPolicyJavascriptEnabled, |
| 198 prefs::kWebKitJavascriptEnabled }, | 199 prefs::kWebKitJavascriptEnabled }, |
| 199 { Value::TYPE_BOOLEAN, kPolicySavingBrowserHistoryDisabled, | 200 { Value::TYPE_BOOLEAN, kPolicySavingBrowserHistoryDisabled, |
| 200 prefs::kSavingBrowserHistoryDisabled }, | 201 prefs::kSavingBrowserHistoryDisabled }, |
| 201 { Value::TYPE_BOOLEAN, kPolicyDeveloperToolsDisabled, | 202 { Value::TYPE_BOOLEAN, kPolicyDeveloperToolsDisabled, |
| (...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 363 } | 364 } |
| 364 return false; | 365 return false; |
| 365 } | 366 } |
| 366 | 367 |
| 367 bool ConfigurationPolicyPrefKeeper::ApplyProxyPolicy( | 368 bool ConfigurationPolicyPrefKeeper::ApplyProxyPolicy( |
| 368 ConfigurationPolicyType policy, | 369 ConfigurationPolicyType policy, |
| 369 Value* value) { | 370 Value* value) { |
| 370 // We only collect the values until we have sufficient information when | 371 // We only collect the values until we have sufficient information when |
| 371 // FinalizeProxyPolicySettings() is called to determine whether the presented | 372 // FinalizeProxyPolicySettings() is called to determine whether the presented |
| 372 // values were correct and apply them in that case. | 373 // values were correct and apply them in that case. |
| 373 if (policy == kPolicyProxyMode || | 374 if (policy == kPolicyProxyServerMode || |
| 374 policy == kPolicyProxyServer || | 375 policy == kPolicyProxyServer || |
| 375 policy == kPolicyProxyPacUrl || | 376 policy == kPolicyProxyPacUrl || |
| 376 policy == kPolicyProxyBypassList) { | 377 policy == kPolicyProxyBypassList) { |
| 377 delete proxy_policies_[policy]; | 378 delete proxy_policies_[policy]; |
| 378 proxy_policies_[policy] = value; | 379 proxy_policies_[policy] = value; |
| 379 return true; | 380 return true; |
| 380 } | 381 } |
| 381 // We are not interested in this policy. | 382 // We are not interested in this policy. |
| 382 return false; | 383 return false; |
| 383 } | 384 } |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 490 void ConfigurationPolicyPrefKeeper::FinalizeProxyPolicySettings() { | 491 void ConfigurationPolicyPrefKeeper::FinalizeProxyPolicySettings() { |
| 491 if (CheckProxySettings()) | 492 if (CheckProxySettings()) |
| 492 ApplyProxySettings(); | 493 ApplyProxySettings(); |
| 493 | 494 |
| 494 STLDeleteContainerPairSecondPointers(proxy_policies_.begin(), | 495 STLDeleteContainerPairSecondPointers(proxy_policies_.begin(), |
| 495 proxy_policies_.end()); | 496 proxy_policies_.end()); |
| 496 proxy_policies_.clear(); | 497 proxy_policies_.clear(); |
| 497 } | 498 } |
| 498 | 499 |
| 499 bool ConfigurationPolicyPrefKeeper::CheckProxySettings() { | 500 bool ConfigurationPolicyPrefKeeper::CheckProxySettings() { |
| 500 bool mode = HasProxyPolicy(kPolicyProxyMode); | 501 bool mode = HasProxyPolicy(kPolicyProxyServerMode); |
| 501 bool server = HasProxyPolicy(kPolicyProxyServer); | 502 bool server = HasProxyPolicy(kPolicyProxyServer); |
| 502 bool pac_url = HasProxyPolicy(kPolicyProxyPacUrl); | 503 bool pac_url = HasProxyPolicy(kPolicyProxyPacUrl); |
| 503 bool bypass_list = HasProxyPolicy(kPolicyProxyBypassList); | 504 bool bypass_list = HasProxyPolicy(kPolicyProxyBypassList); |
| 504 | 505 |
| 505 if ((server || pac_url || bypass_list) && !mode) { | 506 if ((server || pac_url || bypass_list) && !mode) { |
| 506 LOG(WARNING) << "A centrally-administered policy defines proxy setting" | 507 LOG(WARNING) << "A centrally-administered policy defines proxy setting" |
| 507 << " details without setting a proxy mode."; | 508 << " details without setting a proxy mode."; |
| 508 return false; | 509 return false; |
| 509 } | 510 } |
| 510 | 511 |
| 511 if (!mode) | 512 if (!mode) |
| 512 return true; | 513 return true; |
| 513 | 514 |
| 514 int mode_value; | 515 int mode_value; |
| 515 if (!proxy_policies_[kPolicyProxyMode]->GetAsInteger(&mode_value)) { | 516 if (!proxy_policies_[kPolicyProxyServerMode]->GetAsInteger(&mode_value)) { |
| 516 LOG(WARNING) << "Invalid proxy mode value."; | 517 LOG(WARNING) << "Invalid proxy mode value."; |
| 517 return false; | 518 return false; |
| 518 } | 519 } |
| 519 | 520 |
| 520 switch (mode_value) { | 521 switch (mode_value) { |
| 521 case kPolicyNoProxyServerMode: | 522 case kPolicyNoProxyServerMode: |
| 522 if (server || pac_url || bypass_list) { | 523 if (server || pac_url || bypass_list) { |
| 523 LOG(WARNING) << "A centrally-administered policy disables the use of" | 524 LOG(WARNING) << "A centrally-administered policy disables the use of" |
| 524 << " a proxy but also specifies an explicit proxy" | 525 << " a proxy but also specifies an explicit proxy" |
| 525 << " configuration."; | 526 << " configuration."; |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 557 } | 558 } |
| 558 break; | 559 break; |
| 559 default: | 560 default: |
| 560 LOG(WARNING) << "Invalid proxy mode " << mode_value; | 561 LOG(WARNING) << "Invalid proxy mode " << mode_value; |
| 561 return false; | 562 return false; |
| 562 } | 563 } |
| 563 return true; | 564 return true; |
| 564 } | 565 } |
| 565 | 566 |
| 566 void ConfigurationPolicyPrefKeeper::ApplyProxySettings() { | 567 void ConfigurationPolicyPrefKeeper::ApplyProxySettings() { |
| 567 if (!HasProxyPolicy(kPolicyProxyMode)) | 568 if (!HasProxyPolicy(kPolicyProxyServerMode)) |
| 568 return; | 569 return; |
| 569 | 570 |
| 570 int int_mode; | 571 int int_mode; |
| 571 CHECK(proxy_policies_[kPolicyProxyMode]->GetAsInteger(&int_mode)); | 572 CHECK(proxy_policies_[kPolicyProxyServerMode]->GetAsInteger(&int_mode)); |
| 572 ProxyPrefs::ProxyMode mode; | 573 ProxyPrefs::ProxyMode mode; |
| 573 switch (int_mode) { | 574 switch (int_mode) { |
| 574 case kPolicyNoProxyServerMode: | 575 case kPolicyNoProxyServerMode: |
| 575 mode = ProxyPrefs::MODE_DIRECT; | 576 mode = ProxyPrefs::MODE_DIRECT; |
| 576 break; | 577 break; |
| 577 case kPolicyAutoDetectProxyMode: | 578 case kPolicyAutoDetectProxyMode: |
| 578 mode = ProxyPrefs::MODE_AUTO_DETECT; | 579 mode = ProxyPrefs::MODE_AUTO_DETECT; |
| 579 break; | 580 break; |
| 580 case kPolicyManuallyConfiguredProxyMode: | 581 case kPolicyManuallyConfiguredProxyMode: |
| 581 mode = ProxyPrefs::MODE_FIXED_SERVERS; | 582 mode = ProxyPrefs::MODE_FIXED_SERVERS; |
| (...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 770 ConfigurationPolicyPrefStore* | 771 ConfigurationPolicyPrefStore* |
| 771 ConfigurationPolicyPrefStore::CreateRecommendedPolicyPrefStore() { | 772 ConfigurationPolicyPrefStore::CreateRecommendedPolicyPrefStore() { |
| 772 return new ConfigurationPolicyPrefStore( | 773 return new ConfigurationPolicyPrefStore( |
| 773 g_configuration_policy_provider_keeper.Get().recommended_provider()); | 774 g_configuration_policy_provider_keeper.Get().recommended_provider()); |
| 774 } | 775 } |
| 775 | 776 |
| 776 /* static */ | 777 /* static */ |
| 777 const ConfigurationPolicyProvider::PolicyDefinitionList* | 778 const ConfigurationPolicyProvider::PolicyDefinitionList* |
| 778 ConfigurationPolicyPrefStore::GetChromePolicyDefinitionList() { | 779 ConfigurationPolicyPrefStore::GetChromePolicyDefinitionList() { |
| 779 static ConfigurationPolicyProvider::PolicyDefinitionList::Entry entries[] = { | 780 static ConfigurationPolicyProvider::PolicyDefinitionList::Entry entries[] = { |
| 780 { kPolicyHomePage, Value::TYPE_STRING, key::kHomepageLocation }, | 781 { kPolicyHomepageLocation, Value::TYPE_STRING, key::kHomepageLocation }, |
| 781 { kPolicyHomepageIsNewTabPage, Value::TYPE_BOOLEAN, | 782 { kPolicyHomepageIsNewTabPage, Value::TYPE_BOOLEAN, |
| 782 key::kHomepageIsNewTabPage }, | 783 key::kHomepageIsNewTabPage }, |
| 783 { kPolicyRestoreOnStartup, Value::TYPE_INTEGER, key::kRestoreOnStartup }, | 784 { kPolicyRestoreOnStartup, Value::TYPE_INTEGER, key::kRestoreOnStartup }, |
| 784 { kPolicyURLsToRestoreOnStartup, Value::TYPE_LIST, | 785 { kPolicyRestoreOnStartupURLs, Value::TYPE_LIST, |
| 785 key::kURLsToRestoreOnStartup }, | 786 key::kRestoreOnStartupURLs }, |
| 786 { kPolicyDefaultSearchProviderEnabled, Value::TYPE_BOOLEAN, | 787 { kPolicyDefaultSearchProviderEnabled, Value::TYPE_BOOLEAN, |
| 787 key::kDefaultSearchProviderEnabled }, | 788 key::kDefaultSearchProviderEnabled }, |
| 788 { kPolicyDefaultSearchProviderName, Value::TYPE_STRING, | 789 { kPolicyDefaultSearchProviderName, Value::TYPE_STRING, |
| 789 key::kDefaultSearchProviderName }, | 790 key::kDefaultSearchProviderName }, |
| 790 { kPolicyDefaultSearchProviderKeyword, Value::TYPE_STRING, | 791 { kPolicyDefaultSearchProviderKeyword, Value::TYPE_STRING, |
| 791 key::kDefaultSearchProviderKeyword }, | 792 key::kDefaultSearchProviderKeyword }, |
| 792 { kPolicyDefaultSearchProviderSearchURL, Value::TYPE_STRING, | 793 { kPolicyDefaultSearchProviderSearchURL, Value::TYPE_STRING, |
| 793 key::kDefaultSearchProviderSearchURL }, | 794 key::kDefaultSearchProviderSearchURL }, |
| 794 { kPolicyDefaultSearchProviderSuggestURL, Value::TYPE_STRING, | 795 { kPolicyDefaultSearchProviderSuggestURL, Value::TYPE_STRING, |
| 795 key::kDefaultSearchProviderSuggestURL }, | 796 key::kDefaultSearchProviderSuggestURL }, |
| 796 { kPolicyDefaultSearchProviderIconURL, Value::TYPE_STRING, | 797 { kPolicyDefaultSearchProviderIconURL, Value::TYPE_STRING, |
| 797 key::kDefaultSearchProviderIconURL }, | 798 key::kDefaultSearchProviderIconURL }, |
| 798 { kPolicyDefaultSearchProviderEncodings, Value::TYPE_STRING, | 799 { kPolicyDefaultSearchProviderEncodings, Value::TYPE_STRING, |
| 799 key::kDefaultSearchProviderEncodings }, | 800 key::kDefaultSearchProviderEncodings }, |
| 800 { kPolicyProxyMode, Value::TYPE_INTEGER, key::kProxyMode }, | 801 { kPolicyProxyServerMode, Value::TYPE_INTEGER, key::kProxyServerMode }, |
| 801 { kPolicyProxyServer, Value::TYPE_STRING, key::kProxyServer }, | 802 { kPolicyProxyServer, Value::TYPE_STRING, key::kProxyServer }, |
| 802 { kPolicyProxyPacUrl, Value::TYPE_STRING, key::kProxyPacUrl }, | 803 { kPolicyProxyPacUrl, Value::TYPE_STRING, key::kProxyPacUrl }, |
| 803 { kPolicyProxyBypassList, Value::TYPE_STRING, key::kProxyBypassList }, | 804 { kPolicyProxyBypassList, Value::TYPE_STRING, key::kProxyBypassList }, |
| 804 { kPolicyAlternateErrorPagesEnabled, Value::TYPE_BOOLEAN, | 805 { kPolicyAlternateErrorPagesEnabled, Value::TYPE_BOOLEAN, |
| 805 key::kAlternateErrorPagesEnabled }, | 806 key::kAlternateErrorPagesEnabled }, |
| 806 { kPolicySearchSuggestEnabled, Value::TYPE_BOOLEAN, | 807 { kPolicySearchSuggestEnabled, Value::TYPE_BOOLEAN, |
| 807 key::kSearchSuggestEnabled }, | 808 key::kSearchSuggestEnabled }, |
| 808 { kPolicyDnsPrefetchingEnabled, Value::TYPE_BOOLEAN, | 809 { kPolicyDnsPrefetchingEnabled, Value::TYPE_BOOLEAN, |
| 809 key::kDnsPrefetchingEnabled }, | 810 key::kDnsPrefetchingEnabled }, |
| 810 { kPolicyDisableSpdy, Value::TYPE_BOOLEAN, key::kDisableSpdy }, | 811 { kPolicyDisableSpdy, Value::TYPE_BOOLEAN, key::kDisableSpdy }, |
| 811 { kPolicySafeBrowsingEnabled, Value::TYPE_BOOLEAN, | 812 { kPolicySafeBrowsingEnabled, Value::TYPE_BOOLEAN, |
| 812 key::kSafeBrowsingEnabled }, | 813 key::kSafeBrowsingEnabled }, |
| 813 { kPolicyMetricsReportingEnabled, Value::TYPE_BOOLEAN, | 814 { kPolicyMetricsReportingEnabled, Value::TYPE_BOOLEAN, |
| 814 key::kMetricsReportingEnabled }, | 815 key::kMetricsReportingEnabled }, |
| 815 { kPolicyPasswordManagerEnabled, Value::TYPE_BOOLEAN, | 816 { kPolicyPasswordManagerEnabled, Value::TYPE_BOOLEAN, |
| 816 key::kPasswordManagerEnabled }, | 817 key::kPasswordManagerEnabled }, |
| 817 { kPolicyPasswordManagerAllowShowPasswords, Value::TYPE_BOOLEAN, | 818 { kPolicyPasswordManagerAllowShowPasswords, Value::TYPE_BOOLEAN, |
| 818 key::kPasswordManagerAllowShowPasswords }, | 819 key::kPasswordManagerAllowShowPasswords }, |
| 819 { kPolicyAutoFillEnabled, Value::TYPE_BOOLEAN, key::kAutoFillEnabled }, | 820 { kPolicyAutoFillEnabled, Value::TYPE_BOOLEAN, key::kAutoFillEnabled }, |
| 820 { kPolicyDisabledPlugins, Value::TYPE_LIST, key::kDisabledPlugins }, | 821 { kPolicyDisabledPlugins, Value::TYPE_LIST, key::kDisabledPlugins }, |
| 821 { kPolicyApplicationLocale, Value::TYPE_STRING, | 822 { kPolicyApplicationLocaleValue, Value::TYPE_STRING, |
| 822 key::kApplicationLocaleValue }, | 823 key::kApplicationLocaleValue }, |
| 823 { kPolicySyncDisabled, Value::TYPE_BOOLEAN, key::kSyncDisabled }, | 824 { kPolicySyncDisabled, Value::TYPE_BOOLEAN, key::kSyncDisabled }, |
| 824 { kPolicyExtensionInstallAllowList, Value::TYPE_LIST, | 825 { kPolicyExtensionInstallWhitelist, Value::TYPE_LIST, |
| 825 key::kExtensionInstallAllowList }, | 826 key::kExtensionInstallWhitelist }, |
| 826 { kPolicyExtensionInstallDenyList, Value::TYPE_LIST, | 827 { kPolicyExtensionInstallBlacklist, Value::TYPE_LIST, |
| 827 key::kExtensionInstallDenyList }, | 828 key::kExtensionInstallBlacklist }, |
| 828 { kPolicyExtensionInstallForceList, Value::TYPE_LIST, | 829 { kPolicyExtensionInstallForcelist, Value::TYPE_LIST, |
| 829 key::kExtensionInstallForceList }, | 830 key::kExtensionInstallForcelist }, |
| 830 { kPolicyShowHomeButton, Value::TYPE_BOOLEAN, key::kShowHomeButton }, | 831 { kPolicyShowHomeButton, Value::TYPE_BOOLEAN, key::kShowHomeButton }, |
| 831 { kPolicyPrintingEnabled, Value::TYPE_BOOLEAN, key::kPrintingEnabled }, | 832 { kPolicyPrintingEnabled, Value::TYPE_BOOLEAN, key::kPrintingEnabled }, |
| 832 { kPolicyJavascriptEnabled, Value::TYPE_BOOLEAN, key::kJavascriptEnabled }, | 833 { kPolicyJavascriptEnabled, Value::TYPE_BOOLEAN, key::kJavascriptEnabled }, |
| 833 { kPolicySavingBrowserHistoryDisabled, Value::TYPE_BOOLEAN, | 834 { kPolicySavingBrowserHistoryDisabled, Value::TYPE_BOOLEAN, |
| 834 key::kSavingBrowserHistoryDisabled }, | 835 key::kSavingBrowserHistoryDisabled }, |
| 835 { kPolicyDeveloperToolsDisabled, Value::TYPE_BOOLEAN, | 836 { kPolicyDeveloperToolsDisabled, Value::TYPE_BOOLEAN, |
| 836 key::kDeveloperToolsDisabled }, | 837 key::kDeveloperToolsDisabled }, |
| 837 { kPolicyBlockThirdPartyCookies, Value::TYPE_BOOLEAN, | 838 { kPolicyBlockThirdPartyCookies, Value::TYPE_BOOLEAN, |
| 838 key::kBlockThirdPartyCookies }, | 839 key::kBlockThirdPartyCookies }, |
| 839 { kPolicyDefaultCookiesSetting, Value::TYPE_INTEGER, | 840 { kPolicyDefaultCookiesSetting, Value::TYPE_INTEGER, |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 896 // Update the initialization flag. | 897 // Update the initialization flag. |
| 897 if (!initialization_complete_ && | 898 if (!initialization_complete_ && |
| 898 provider_->IsInitializationComplete()) { | 899 provider_->IsInitializationComplete()) { |
| 899 initialization_complete_ = true; | 900 initialization_complete_ = true; |
| 900 FOR_EACH_OBSERVER(PrefStore::Observer, observers_, | 901 FOR_EACH_OBSERVER(PrefStore::Observer, observers_, |
| 901 OnInitializationCompleted()); | 902 OnInitializationCompleted()); |
| 902 } | 903 } |
| 903 } | 904 } |
| 904 | 905 |
| 905 } // namespace policy | 906 } // namespace policy |
| OLD | NEW |