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

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

Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: One more merge to head. 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
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/component_loader.h" 5 #include "chrome/browser/extensions/component_loader.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/json/json_string_value_serializer.h" 9 #include "base/json/json_string_value_serializer.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
11 #include "base/prefs/pref_notifier.h" 11 #include "base/prefs/pref_notifier.h"
12 #include "base/prefs/public/pref_change_registrar.h" 12 #include "base/prefs/public/pref_change_registrar.h"
13 #include "chrome/browser/browser_process.h" 13 #include "chrome/browser/browser_process.h"
14 #include "chrome/browser/extensions/extension_service.h" 14 #include "chrome/browser/extensions/extension_service.h"
15 #include "chrome/browser/prefs/pref_registry_syncable.h"
15 #include "chrome/browser/prefs/pref_service.h" 16 #include "chrome/browser/prefs/pref_service.h"
16 #include "chrome/browser/profiles/profile.h" 17 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/common/chrome_notification_types.h" 18 #include "chrome/common/chrome_notification_types.h"
18 #include "chrome/common/chrome_paths.h" 19 #include "chrome/common/chrome_paths.h"
19 #include "chrome/common/chrome_switches.h" 20 #include "chrome/common/chrome_switches.h"
20 #include "chrome/common/extensions/extension.h" 21 #include "chrome/common/extensions/extension.h"
21 #include "chrome/common/extensions/extension_file_util.h" 22 #include "chrome/common/extensions/extension_file_util.h"
22 #include "chrome/common/extensions/extension_manifest_constants.h" 23 #include "chrome/common/extensions/extension_manifest_constants.h"
23 #include "chrome/common/pref_names.h" 24 #include "chrome/common/pref_names.h"
24 #include "content/public/browser/notification_details.h" 25 #include "content/public/browser/notification_details.h"
(...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after
424 void ComponentLoader::UnloadComponent(ComponentExtensionInfo* component) { 425 void ComponentLoader::UnloadComponent(ComponentExtensionInfo* component) {
425 delete component->manifest; 426 delete component->manifest;
426 if (extension_service_->is_ready()) { 427 if (extension_service_->is_ready()) {
427 extension_service_-> 428 extension_service_->
428 UnloadExtension(component->extension_id, 429 UnloadExtension(component->extension_id,
429 extension_misc::UNLOAD_REASON_DISABLE); 430 extension_misc::UNLOAD_REASON_DISABLE);
430 } 431 }
431 } 432 }
432 433
433 // static 434 // static
434 void ComponentLoader::RegisterUserPrefs(PrefServiceSyncable* prefs) { 435 void ComponentLoader::RegisterUserPrefs(PrefRegistrySyncable* registry) {
435 prefs->RegisterStringPref(prefs::kEnterpriseWebStoreURL, 436 registry->RegisterStringPref(prefs::kEnterpriseWebStoreURL,
436 std::string() /* default_value */, 437 std::string() /* default_value */,
437 PrefServiceSyncable::UNSYNCABLE_PREF); 438 PrefRegistrySyncable::UNSYNCABLE_PREF);
438 prefs->RegisterStringPref(prefs::kEnterpriseWebStoreName, 439 registry->RegisterStringPref(prefs::kEnterpriseWebStoreName,
439 std::string() /* default_value */, 440 std::string() /* default_value */,
440 PrefServiceSyncable::UNSYNCABLE_PREF); 441 PrefRegistrySyncable::UNSYNCABLE_PREF);
441 } 442 }
442 443
443 } // namespace extensions 444 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698