chrome/browser/prefs/chrome_pref_service_factory.cc - Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources.

Side by Side Diff: chrome/browser/prefs/chrome_pref_service_factory.cc

Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 4 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

« chrome/browser/password_manager/password_manager_util_win.cc ('K') | « chrome/browser/policy/policy_browsertest.cc ('k') | chrome/browser/prerender/prerender_browsertest.cc » ('j') | no next file with comments »
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/prefs/chrome_pref_service_factory.h"	5 #include "chrome/browser/prefs/chrome_pref_service_factory.h"

6	6

7 #include <string>	7 #include <string>

8 #include <vector>	8 #include <vector>

9	9

10 #include "base/bind.h"	10 #include "base/bind.h"

(...skipping 20 matching lines...) Expand all Loading...
31 #include "chrome/browser/prefs/pref_service_syncable.h"	31 #include "chrome/browser/prefs/pref_service_syncable.h"

32 #include "chrome/browser/prefs/pref_service_syncable_factory.h"	32 #include "chrome/browser/prefs/pref_service_syncable_factory.h"

33 #include "chrome/browser/prefs/profile_pref_store_manager.h"	33 #include "chrome/browser/prefs/profile_pref_store_manager.h"

34 #include "chrome/browser/profiles/file_path_verifier_win.h"	34 #include "chrome/browser/profiles/file_path_verifier_win.h"

35 #include "chrome/browser/profiles/profile.h"	35 #include "chrome/browser/profiles/profile.h"

36 #include "chrome/browser/search_engines/default_search_pref_migration.h"	36 #include "chrome/browser/search_engines/default_search_pref_migration.h"

37 #include "chrome/browser/sync/glue/sync_start_util.h"	37 #include "chrome/browser/sync/glue/sync_start_util.h"

38 #include "chrome/browser/ui/profile_error_dialog.h"	38 #include "chrome/browser/ui/profile_error_dialog.h"

39 #include "chrome/common/chrome_constants.h"	39 #include "chrome/common/chrome_constants.h"

40 #include "chrome/common/pref_names.h"	40 #include "chrome/common/pref_names.h"

	41 #include "chrome/grit/chromium_strings.h"

	42 #include "chrome/grit/generated_resources.h"

41 #include "components/pref_registry/pref_registry_syncable.h"	43 #include "components/pref_registry/pref_registry_syncable.h"

42 #include "components/search_engines/default_search_manager.h"	44 #include "components/search_engines/default_search_manager.h"

43 #include "components/search_engines/search_engines_pref_names.h"	45 #include "components/search_engines/search_engines_pref_names.h"

44 #include "components/sync_driver/pref_names.h"	46 #include "components/sync_driver/pref_names.h"

45 #include "content/public/browser/browser_context.h"	47 #include "content/public/browser/browser_context.h"

46 #include "content/public/browser/browser_thread.h"	48 #include "content/public/browser/browser_thread.h"

47 #include "grit/browser_resources.h"	49 #include "grit/browser_resources.h"

48 #include "grit/chromium_strings.h"

49 #include "grit/generated_resources.h"

50 #include "sync/internal_api/public/base/model_type.h"	50 #include "sync/internal_api/public/base/model_type.h"

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

52	52

53 #if defined(ENABLE_CONFIGURATION_POLICY)	53 #if defined(ENABLE_CONFIGURATION_POLICY)

54 #include "components/policy/core/browser/browser_policy_connector.h"	54 #include "components/policy/core/browser/browser_policy_connector.h"

55 #include "components/policy/core/browser/configuration_policy_pref_store.h"	55 #include "components/policy/core/browser/configuration_policy_pref_store.h"

56 #include "components/policy/core/common/policy_types.h"	56 #include "components/policy/core/common/policy_types.h"

57 #endif	57 #endif

58	58

59 #if defined(ENABLE_EXTENSIONS)	59 #if defined(ENABLE_EXTENSIONS)

(...skipping 457 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
517	517

518 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {	518 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {

519 ProfilePrefStoreManager::RegisterProfilePrefs(registry);	519 ProfilePrefStoreManager::RegisterProfilePrefs(registry);

520 }	520 }

521	521

522 void RegisterPrefs(PrefRegistrySimple* registry) {	522 void RegisterPrefs(PrefRegistrySimple* registry) {

523 ProfilePrefStoreManager::RegisterPrefs(registry);	523 ProfilePrefStoreManager::RegisterPrefs(registry);

524 }	524 }

525	525

526 } // namespace chrome_prefs	526 } // namespace chrome_prefs

OLD	NEW