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

Side by Side Diff: chrome/browser/extensions/extension_prefs.cc

Issue 12256040: Second batch of fixing prefs registrations. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head for commit. Created 7 years, 10 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
« no previous file with comments | « no previous file | chrome/browser/prefs/browser_prefs.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/extensions/extension_prefs.h" 5 #include "chrome/browser/extensions/extension_prefs.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/prefs/pref_notifier.h" 8 #include "base/prefs/pref_notifier.h"
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
(...skipping 2246 matching lines...) Expand 10 before | Expand all | Expand 10 after
2257 0, // default value 2257 0, // default value
2258 PrefRegistrySyncable::UNSYNCABLE_PREF); 2258 PrefRegistrySyncable::UNSYNCABLE_PREF);
2259 registry->RegisterListPref(prefs::kExtensionAllowedInstallSites, 2259 registry->RegisterListPref(prefs::kExtensionAllowedInstallSites,
2260 PrefRegistrySyncable::UNSYNCABLE_PREF); 2260 PrefRegistrySyncable::UNSYNCABLE_PREF);
2261 registry->RegisterStringPref(kExtensionsLastChromeVersion, 2261 registry->RegisterStringPref(kExtensionsLastChromeVersion,
2262 std::string(), // default value 2262 std::string(), // default value
2263 PrefRegistrySyncable::UNSYNCABLE_PREF); 2263 PrefRegistrySyncable::UNSYNCABLE_PREF);
2264 registry->RegisterBooleanPref(kSideloadWipeoutDone, 2264 registry->RegisterBooleanPref(kSideloadWipeoutDone,
2265 false, 2265 false,
2266 PrefRegistrySyncable::UNSYNCABLE_PREF); 2266 PrefRegistrySyncable::UNSYNCABLE_PREF);
2267
2268 #if defined (TOOLKIT_VIEWS)
2269 registry->RegisterIntegerPref(prefs::kBrowserActionContainerWidth,
2270 0,
2271 PrefRegistrySyncable::UNSYNCABLE_PREF);
2272 #endif
2267 } 2273 }
2268 2274
2269 ExtensionIdList ExtensionPrefs::GetExtensionPrefAsVector( 2275 ExtensionIdList ExtensionPrefs::GetExtensionPrefAsVector(
2270 const char* pref) { 2276 const char* pref) {
2271 ExtensionIdList extension_ids; 2277 ExtensionIdList extension_ids;
2272 const ListValue* list_of_values = prefs_->GetList(pref); 2278 const ListValue* list_of_values = prefs_->GetList(pref);
2273 if (!list_of_values) 2279 if (!list_of_values)
2274 return extension_ids; 2280 return extension_ids;
2275 2281
2276 std::string extension_id; 2282 std::string extension_id;
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
2364 is_enabled = initial_state == Extension::ENABLED; 2370 is_enabled = initial_state == Extension::ENABLED;
2365 } 2371 }
2366 2372
2367 extension_pref_value_map_->RegisterExtension(extension_id, install_time, 2373 extension_pref_value_map_->RegisterExtension(extension_id, install_time,
2368 is_enabled); 2374 is_enabled);
2369 content_settings_store_->RegisterExtension(extension_id, install_time, 2375 content_settings_store_->RegisterExtension(extension_id, install_time,
2370 is_enabled); 2376 is_enabled);
2371 } 2377 }
2372 2378
2373 } // namespace extensions 2379 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/prefs/browser_prefs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698