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

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

Issue 6793045: Change text of DNS prefetch option to Network prediction option. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Another bad merge fix Created 9 years, 8 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 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 prefs::kHomePageIsNewTabPage }, 161 prefs::kHomePageIsNewTabPage },
162 { Value::TYPE_INTEGER, kPolicyRestoreOnStartup, 162 { Value::TYPE_INTEGER, kPolicyRestoreOnStartup,
163 prefs::kRestoreOnStartup}, 163 prefs::kRestoreOnStartup},
164 { Value::TYPE_LIST, kPolicyRestoreOnStartupURLs, 164 { Value::TYPE_LIST, kPolicyRestoreOnStartupURLs,
165 prefs::kURLsToRestoreOnStartup }, 165 prefs::kURLsToRestoreOnStartup },
166 { Value::TYPE_BOOLEAN, kPolicyAlternateErrorPagesEnabled, 166 { Value::TYPE_BOOLEAN, kPolicyAlternateErrorPagesEnabled,
167 prefs::kAlternateErrorPagesEnabled }, 167 prefs::kAlternateErrorPagesEnabled },
168 { Value::TYPE_BOOLEAN, kPolicySearchSuggestEnabled, 168 { Value::TYPE_BOOLEAN, kPolicySearchSuggestEnabled,
169 prefs::kSearchSuggestEnabled }, 169 prefs::kSearchSuggestEnabled },
170 { Value::TYPE_BOOLEAN, kPolicyDnsPrefetchingEnabled, 170 { Value::TYPE_BOOLEAN, kPolicyDnsPrefetchingEnabled,
171 prefs::kDnsPrefetchingEnabled }, 171 prefs::kNetworkPredictionEnabled },
172 { Value::TYPE_BOOLEAN, kPolicyDisableSpdy, 172 { Value::TYPE_BOOLEAN, kPolicyDisableSpdy,
173 prefs::kDisableSpdy }, 173 prefs::kDisableSpdy },
174 { Value::TYPE_BOOLEAN, kPolicySafeBrowsingEnabled, 174 { Value::TYPE_BOOLEAN, kPolicySafeBrowsingEnabled,
175 prefs::kSafeBrowsingEnabled }, 175 prefs::kSafeBrowsingEnabled },
176 { Value::TYPE_BOOLEAN, kPolicyPasswordManagerEnabled, 176 { Value::TYPE_BOOLEAN, kPolicyPasswordManagerEnabled,
177 prefs::kPasswordManagerEnabled }, 177 prefs::kPasswordManagerEnabled },
178 { Value::TYPE_BOOLEAN, kPolicyPasswordManagerAllowShowPasswords, 178 { Value::TYPE_BOOLEAN, kPolicyPasswordManagerAllowShowPasswords,
179 prefs::kPasswordManagerAllowShowPasswords }, 179 prefs::kPasswordManagerAllowShowPasswords },
180 { Value::TYPE_BOOLEAN, kPolicyPrintingEnabled, 180 { Value::TYPE_BOOLEAN, kPolicyPrintingEnabled,
181 prefs::kPrintingEnabled }, 181 prefs::kPrintingEnabled },
(...skipping 844 matching lines...) Expand 10 before | Expand all | Expand 10 after
1026 // Update the initialization flag. 1026 // Update the initialization flag.
1027 if (!initialization_complete_ && 1027 if (!initialization_complete_ &&
1028 provider_->IsInitializationComplete()) { 1028 provider_->IsInitializationComplete()) {
1029 initialization_complete_ = true; 1029 initialization_complete_ = true;
1030 FOR_EACH_OBSERVER(PrefStore::Observer, observers_, 1030 FOR_EACH_OBSERVER(PrefStore::Observer, observers_,
1031 OnInitializationCompleted()); 1031 OnInitializationCompleted());
1032 } 1032 }
1033 } 1033 }
1034 1034
1035 } // namespace policy 1035 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698