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

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

Issue 7328018: Migrate default geolocation content setting to host content settings map. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix nits Created 9 years, 5 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 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 prefs::kManagedPluginsAllowedForUrls }, 229 prefs::kManagedPluginsAllowedForUrls },
230 { Value::TYPE_LIST, kPolicyPluginsBlockedForUrls, 230 { Value::TYPE_LIST, kPolicyPluginsBlockedForUrls,
231 prefs::kManagedPluginsBlockedForUrls }, 231 prefs::kManagedPluginsBlockedForUrls },
232 { Value::TYPE_LIST, kPolicyPopupsAllowedForUrls, 232 { Value::TYPE_LIST, kPolicyPopupsAllowedForUrls,
233 prefs::kManagedPopupsAllowedForUrls }, 233 prefs::kManagedPopupsAllowedForUrls },
234 { Value::TYPE_LIST, kPolicyPopupsBlockedForUrls, 234 { Value::TYPE_LIST, kPolicyPopupsBlockedForUrls,
235 prefs::kManagedPopupsBlockedForUrls }, 235 prefs::kManagedPopupsBlockedForUrls },
236 { Value::TYPE_INTEGER, kPolicyDefaultNotificationSetting, 236 { Value::TYPE_INTEGER, kPolicyDefaultNotificationSetting,
237 prefs::kDesktopNotificationDefaultContentSetting }, 237 prefs::kDesktopNotificationDefaultContentSetting },
238 { Value::TYPE_INTEGER, kPolicyDefaultGeolocationSetting, 238 { Value::TYPE_INTEGER, kPolicyDefaultGeolocationSetting,
239 prefs::kGeolocationDefaultContentSetting }, 239 prefs::kManagedDefaultGeolocationSetting },
240 { Value::TYPE_STRING, kPolicyAuthSchemes, 240 { Value::TYPE_STRING, kPolicyAuthSchemes,
241 prefs::kAuthSchemes }, 241 prefs::kAuthSchemes },
242 { Value::TYPE_BOOLEAN, kPolicyDisableAuthNegotiateCnameLookup, 242 { Value::TYPE_BOOLEAN, kPolicyDisableAuthNegotiateCnameLookup,
243 prefs::kDisableAuthNegotiateCnameLookup }, 243 prefs::kDisableAuthNegotiateCnameLookup },
244 { Value::TYPE_BOOLEAN, kPolicyEnableAuthNegotiatePort, 244 { Value::TYPE_BOOLEAN, kPolicyEnableAuthNegotiatePort,
245 prefs::kEnableAuthNegotiatePort }, 245 prefs::kEnableAuthNegotiatePort },
246 { Value::TYPE_STRING, kPolicyAuthServerWhitelist, 246 { Value::TYPE_STRING, kPolicyAuthServerWhitelist,
247 prefs::kAuthServerWhitelist }, 247 prefs::kAuthServerWhitelist },
248 { Value::TYPE_STRING, kPolicyAuthNegotiateDelegateWhitelist, 248 { Value::TYPE_STRING, kPolicyAuthNegotiateDelegateWhitelist,
249 prefs::kAuthNegotiateDelegateWhitelist }, 249 prefs::kAuthNegotiateDelegateWhitelist },
(...skipping 875 matching lines...) Expand 10 before | Expand all | Expand 10 after
1125 // Update the initialization flag. 1125 // Update the initialization flag.
1126 if (!initialization_complete_ && 1126 if (!initialization_complete_ &&
1127 provider_->IsInitializationComplete()) { 1127 provider_->IsInitializationComplete()) {
1128 initialization_complete_ = true; 1128 initialization_complete_ = true;
1129 FOR_EACH_OBSERVER(PrefStore::Observer, observers_, 1129 FOR_EACH_OBSERVER(PrefStore::Observer, observers_,
1130 OnInitializationCompleted(true)); 1130 OnInitializationCompleted(true));
1131 } 1131 }
1132 } 1132 }
1133 1133
1134 } // namespace policy 1134 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698