diff options
| author | hashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-25 16:23:03 +0000 |
|---|---|---|
| committer | hashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-25 16:23:03 +0000 |
| commit | 0bdc44d8810fc14469a98edfeaea595edfda7a7b (patch) | |
| tree | 336535bbf2f1f7fb1d75d0533359d518dae8009a /components/search_engines | |
| parent | 0c987783e9198af163755194df05ac933ed40df1 (diff) | |
| download | chromium_src-0bdc44d8810fc14469a98edfeaea595edfda7a7b.zip chromium_src-0bdc44d8810fc14469a98edfeaea595edfda7a7b.tar.gz chromium_src-0bdc44d8810fc14469a98edfeaea595edfda7a7b.tar.bz2 | |
Remove redundant chrome/common include from chrome/browser/search_engines
Move pref names kSearchProviderOverrides, kSearchProviderOverridesVersion, kCountryIDAtInstall and kGeoIDAtInstall to components/search_engines.
Remove include "chrome/common/*" if possible.
BUG=371535
TEST=build
TBR=battre@chromium.org for include fix under chrome/browser/profile_resetter
Review URL: https://codereview.chromium.org/335703005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@279724 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/search_engines')
| -rw-r--r-- | components/search_engines/search_engines_pref_names.cc | 15 | ||||
| -rw-r--r-- | components/search_engines/search_engines_pref_names.h | 3 |
2 files changed, 18 insertions, 0 deletions
diff --git a/components/search_engines/search_engines_pref_names.cc b/components/search_engines/search_engines_pref_names.cc index 1c46c2f..0a0d51f 100644 --- a/components/search_engines/search_engines_pref_names.cc +++ b/components/search_engines/search_engines_pref_names.cc @@ -94,4 +94,19 @@ const char kDefaultSearchProviderAlternateURLs[] = const char kDefaultSearchProviderSearchTermsReplacementKey[] = "default_search_provider.search_terms_replacement_key"; +// The dictionary key used when the default search providers are given +// in the preferences file. Normally they are copied from the master +// preferences file. +const char kSearchProviderOverrides[] = "search_provider_overrides"; +// The format version for the dictionary above. +const char kSearchProviderOverridesVersion[] = + "search_provider_overrides_version"; + +// Integer containing the system Country ID the first time we checked the +// template URL prepopulate data. This is used to avoid adding a whole bunch of +// new search engine choices if prepopulation runs when the user's Country ID +// differs from their previous Country ID. This pref does not exist until +// prepopulation has been run at least once. +const char kCountryIDAtInstall[] = "countryid_at_install"; + } // namespace prefs diff --git a/components/search_engines/search_engines_pref_names.h b/components/search_engines/search_engines_pref_names.h index e93c0f7..22f7e81 100644 --- a/components/search_engines/search_engines_pref_names.h +++ b/components/search_engines/search_engines_pref_names.h @@ -26,6 +26,9 @@ extern const char kDefaultSearchProviderID[]; extern const char kDefaultSearchProviderPrepopulateID[]; extern const char kDefaultSearchProviderAlternateURLs[]; extern const char kDefaultSearchProviderSearchTermsReplacementKey[]; +extern const char kSearchProviderOverrides[]; +extern const char kSearchProviderOverridesVersion[]; +extern const char kCountryIDAtInstall[]; } // namespace prefs |