chrome/browser/extensions/component_loader.cc - Issue 12340111: Introduce //components/user_prefs, use to eliminate c/b/prefs dependency in Autofill.

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

Issue 12340111: Introduce //components/user_prefs, use to eliminate c/b/prefs dependency in Autofill. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Pure merge of LKGR Created 7 years, 9 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 | « chrome/browser/extensions/api/tabs/tabs_api.cc ('k') | chrome/browser/extensions/component_loader_unittest.cc » ('j') | components/user_prefs/pref_registry_syncable.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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/pref_service.h"	12 #include "base/prefs/pref_service.h"

13 #include "base/prefs/public/pref_change_registrar.h"	13 #include "base/prefs/public/pref_change_registrar.h"

14 #include "chrome/browser/browser_process.h"	14 #include "chrome/browser/browser_process.h"

15 #include "chrome/browser/extensions/extension_service.h"	15 #include "chrome/browser/extensions/extension_service.h"

16 #include "chrome/browser/prefs/pref_registry_syncable.h"

17 #include "chrome/browser/profiles/profile.h"	16 #include "chrome/browser/profiles/profile.h"

18 #include "chrome/common/chrome_notification_types.h"	17 #include "chrome/common/chrome_notification_types.h"

19 #include "chrome/common/chrome_paths.h"	18 #include "chrome/common/chrome_paths.h"

20 #include "chrome/common/chrome_switches.h"	19 #include "chrome/common/chrome_switches.h"

21 #include "chrome/common/extensions/extension.h"	20 #include "chrome/common/extensions/extension.h"

22 #include "chrome/common/extensions/extension_file_util.h"	21 #include "chrome/common/extensions/extension_file_util.h"

23 #include "chrome/common/extensions/extension_manifest_constants.h"	22 #include "chrome/common/extensions/extension_manifest_constants.h"

24 #include "chrome/common/pref_names.h"	23 #include "chrome/common/pref_names.h"

	24 #include "components/user_prefs/pref_registry_syncable.h"

25 #include "content/public/browser/notification_details.h"	25 #include "content/public/browser/notification_details.h"

26 #include "content/public/browser/notification_source.h"	26 #include "content/public/browser/notification_source.h"

27 #include "grit/browser_resources.h"	27 #include "grit/browser_resources.h"

28 #include "ui/base/resource/resource_bundle.h"	28 #include "ui/base/resource/resource_bundle.h"

29	29

30 #if defined(OFFICIAL_BUILD)	30 #if defined(OFFICIAL_BUILD)

31 #include "chrome/browser/defaults.h"	31 #include "chrome/browser/defaults.h"

32 #endif	32 #endif

33	33

34 #if defined(OS_CHROMEOS)	34 #if defined(OS_CHROMEOS)

(...skipping 426 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
461 void ComponentLoader::RegisterUserPrefs(PrefRegistrySyncable* registry) {	461 void ComponentLoader::RegisterUserPrefs(PrefRegistrySyncable* registry) {

462 registry->RegisterStringPref(prefs::kEnterpriseWebStoreURL,	462 registry->RegisterStringPref(prefs::kEnterpriseWebStoreURL,

463 std::string() /* default_value */,	463 std::string() /* default_value */,

464 PrefRegistrySyncable::UNSYNCABLE_PREF);	464 PrefRegistrySyncable::UNSYNCABLE_PREF);

465 registry->RegisterStringPref(prefs::kEnterpriseWebStoreName,	465 registry->RegisterStringPref(prefs::kEnterpriseWebStoreName,

466 std::string() /* default_value */,	466 std::string() /* default_value */,

467 PrefRegistrySyncable::UNSYNCABLE_PREF);	467 PrefRegistrySyncable::UNSYNCABLE_PREF);

468 }	468 }

469	469

470 } // namespace extensions	470 } // namespace extensions

OLD	NEW