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

Side by Side Diff: chrome/browser/policy/configuration_policy_pref_store.cc

Issue 6399001: Revert 72624 (due to crashes) - Implement pref policy for disabling incognito... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 { Value::TYPE_LIST, kPolicyExtensionInstallDenyList, 182 { Value::TYPE_LIST, kPolicyExtensionInstallDenyList,
183 prefs::kExtensionInstallDenyList}, 183 prefs::kExtensionInstallDenyList},
184 { Value::TYPE_LIST, kPolicyExtensionInstallForceList, 184 { Value::TYPE_LIST, kPolicyExtensionInstallForceList,
185 prefs::kExtensionInstallForceList}, 185 prefs::kExtensionInstallForceList},
186 { Value::TYPE_LIST, kPolicyDisabledPlugins, 186 { Value::TYPE_LIST, kPolicyDisabledPlugins,
187 prefs::kPluginsPluginsBlacklist}, 187 prefs::kPluginsPluginsBlacklist},
188 { Value::TYPE_BOOLEAN, kPolicyShowHomeButton, 188 { Value::TYPE_BOOLEAN, kPolicyShowHomeButton,
189 prefs::kShowHomeButton }, 189 prefs::kShowHomeButton },
190 { Value::TYPE_BOOLEAN, kPolicyJavascriptEnabled, 190 { Value::TYPE_BOOLEAN, kPolicyJavascriptEnabled,
191 prefs::kWebKitJavascriptEnabled }, 191 prefs::kWebKitJavascriptEnabled },
192 { Value::TYPE_BOOLEAN, kPolicyIncognitoEnabled,
193 prefs::kIncognitoEnabled },
194 { Value::TYPE_BOOLEAN, kPolicySavingBrowserHistoryDisabled, 192 { Value::TYPE_BOOLEAN, kPolicySavingBrowserHistoryDisabled,
195 prefs::kSavingBrowserHistoryDisabled }, 193 prefs::kSavingBrowserHistoryDisabled },
196 { Value::TYPE_BOOLEAN, kPolicyDeveloperToolsDisabled, 194 { Value::TYPE_BOOLEAN, kPolicyDeveloperToolsDisabled,
197 prefs::kDevToolsDisabled }, 195 prefs::kDevToolsDisabled },
198 { Value::TYPE_BOOLEAN, kPolicyBlockThirdPartyCookies, 196 { Value::TYPE_BOOLEAN, kPolicyBlockThirdPartyCookies,
199 prefs::kBlockThirdPartyCookies }, 197 prefs::kBlockThirdPartyCookies },
200 { Value::TYPE_INTEGER, kPolicyDefaultCookiesSetting, 198 { Value::TYPE_INTEGER, kPolicyDefaultCookiesSetting,
201 prefs::kManagedDefaultCookiesSetting }, 199 prefs::kManagedDefaultCookiesSetting },
202 { Value::TYPE_INTEGER, kPolicyDefaultImagesSetting, 200 { Value::TYPE_INTEGER, kPolicyDefaultImagesSetting,
203 prefs::kManagedDefaultImagesSetting }, 201 prefs::kManagedDefaultImagesSetting },
(...skipping 594 matching lines...) Expand 10 before | Expand all | Expand 10 after
798 { kPolicySyncDisabled, Value::TYPE_BOOLEAN, key::kSyncDisabled }, 796 { kPolicySyncDisabled, Value::TYPE_BOOLEAN, key::kSyncDisabled },
799 { kPolicyExtensionInstallAllowList, Value::TYPE_LIST, 797 { kPolicyExtensionInstallAllowList, Value::TYPE_LIST,
800 key::kExtensionInstallAllowList }, 798 key::kExtensionInstallAllowList },
801 { kPolicyExtensionInstallDenyList, Value::TYPE_LIST, 799 { kPolicyExtensionInstallDenyList, Value::TYPE_LIST,
802 key::kExtensionInstallDenyList }, 800 key::kExtensionInstallDenyList },
803 { kPolicyExtensionInstallForceList, Value::TYPE_LIST, 801 { kPolicyExtensionInstallForceList, Value::TYPE_LIST,
804 key::kExtensionInstallForceList }, 802 key::kExtensionInstallForceList },
805 { kPolicyShowHomeButton, Value::TYPE_BOOLEAN, key::kShowHomeButton }, 803 { kPolicyShowHomeButton, Value::TYPE_BOOLEAN, key::kShowHomeButton },
806 { kPolicyPrintingEnabled, Value::TYPE_BOOLEAN, key::kPrintingEnabled }, 804 { kPolicyPrintingEnabled, Value::TYPE_BOOLEAN, key::kPrintingEnabled },
807 { kPolicyJavascriptEnabled, Value::TYPE_BOOLEAN, key::kJavascriptEnabled }, 805 { kPolicyJavascriptEnabled, Value::TYPE_BOOLEAN, key::kJavascriptEnabled },
808 { kPolicyIncognitoEnabled, Value::TYPE_BOOLEAN, key::kIncognitoEnabled },
809 { kPolicySavingBrowserHistoryDisabled, Value::TYPE_BOOLEAN, 806 { kPolicySavingBrowserHistoryDisabled, Value::TYPE_BOOLEAN,
810 key::kSavingBrowserHistoryDisabled }, 807 key::kSavingBrowserHistoryDisabled },
811 { kPolicyDeveloperToolsDisabled, Value::TYPE_BOOLEAN, 808 { kPolicyDeveloperToolsDisabled, Value::TYPE_BOOLEAN,
812 key::kDeveloperToolsDisabled }, 809 key::kDeveloperToolsDisabled },
813 { kPolicyBlockThirdPartyCookies, Value::TYPE_BOOLEAN, 810 { kPolicyBlockThirdPartyCookies, Value::TYPE_BOOLEAN,
814 key::kBlockThirdPartyCookies }, 811 key::kBlockThirdPartyCookies },
815 { kPolicyDefaultCookiesSetting, Value::TYPE_INTEGER, 812 { kPolicyDefaultCookiesSetting, Value::TYPE_INTEGER,
816 key::kDefaultCookiesSetting }, 813 key::kDefaultCookiesSetting },
817 { kPolicyDefaultImagesSetting, Value::TYPE_INTEGER, 814 { kPolicyDefaultImagesSetting, Value::TYPE_INTEGER,
818 key::kDefaultImagesSetting }, 815 key::kDefaultImagesSetting },
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
877 // Update the initialization flag. 874 // Update the initialization flag.
878 if (!initialization_complete_ && 875 if (!initialization_complete_ &&
879 provider_->IsInitializationComplete()) { 876 provider_->IsInitializationComplete()) {
880 initialization_complete_ = true; 877 initialization_complete_ = true;
881 FOR_EACH_OBSERVER(PrefStore::Observer, observers_, 878 FOR_EACH_OBSERVER(PrefStore::Observer, observers_,
882 OnInitializationCompleted()); 879 OnInitializationCompleted());
883 } 880 }
884 } 881 }
885 882
886 } // namespace policy 883 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698