Bring many of the template_url classes into the fold for the Mac. Note that template_url_model_unittest isn't there; it requires a working database first.

Review URL: http://codereview.chromium.org/19714

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9140 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 5 deletions

diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index d44ce18..2e55a6b 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -426,11 +426,14 @@ const wchar_t kShouldShowWelcomePage[] = L"show-welcome-page";
 // correct Google domain/country code for whatever location the user is in.
 const wchar_t kLastKnownGoogleURL[] = L"browser.last_known_google_url";
 
-// Integer containing the system GeoID 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 GeoID differs
-// from their previous GeoID.  This pref does not exist until prepopulation has
-// been run at least once.
+// 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 wchar_t kCountryIDAtInstall[] = L"countryid_at_install";
+// OBSOLETE. Same as above, but uses the Windows-specific GeoID value instead.
+// Updated if found to the above key.
 const wchar_t kGeoIDAtInstall[] = L"geoid_at_install";
 
 // An enum value of how the browser was shut down (see browser_shutdown.h).