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

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

Issue 14622003: components: Move PrefRegistrySyncable into user_prefs namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes Created 7 years, 7 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"
(...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after
479 void ComponentLoader::UnloadComponent(ComponentExtensionInfo* component) { 479 void ComponentLoader::UnloadComponent(ComponentExtensionInfo* component) {
480 delete component->manifest; 480 delete component->manifest;
481 if (extension_service_->is_ready()) { 481 if (extension_service_->is_ready()) {
482 extension_service_-> 482 extension_service_->
483 UnloadExtension(component->extension_id, 483 UnloadExtension(component->extension_id,
484 extension_misc::UNLOAD_REASON_DISABLE); 484 extension_misc::UNLOAD_REASON_DISABLE);
485 } 485 }
486 } 486 }
487 487
488 // static 488 // static
489 void ComponentLoader::RegisterUserPrefs(PrefRegistrySyncable* registry) { 489 void ComponentLoader::RegisterUserPrefs(
490 registry->RegisterStringPref(prefs::kEnterpriseWebStoreURL, 490 user_prefs::PrefRegistrySyncable* registry) {
491 std::string() /* default_value */, 491 registry->RegisterStringPref(
492 PrefRegistrySyncable::UNSYNCABLE_PREF); 492 prefs::kEnterpriseWebStoreURL,
493 registry->RegisterStringPref(prefs::kEnterpriseWebStoreName, 493 std::string() /* default_value */,
494 std::string() /* default_value */, 494 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
495 PrefRegistrySyncable::UNSYNCABLE_PREF); 495 registry->RegisterStringPref(
496 prefs::kEnterpriseWebStoreName,
497 std::string() /* default_value */,
498 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
496 } 499 }
497 500
498 } // namespace extensions 501 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/component_loader.h ('k') | chrome/browser/extensions/component_loader_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698