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

Side by Side Diff: chrome/browser/search_engines/template_url_prepopulate_data.cc

Issue 18199003: Allow Chrome OS login profile to have different default pref values (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. Created 7 years, 5 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/search_engines/template_url_prepopulate_data.h" 5 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
6 6
7 #if defined(OS_POSIX) && !defined(OS_MACOSX) 7 #if defined(OS_POSIX) && !defined(OS_MACOSX)
8 #include <locale.h> 8 #include <locale.h>
9 #endif 9 #endif
10 10
(...skipping 1071 matching lines...) Expand 10 before | Expand all | Expand 10 after
1082 }; 1082 };
1083 1083
1084 const LogoURLs google_logos = { 1084 const LogoURLs google_logos = {
1085 "https://www.google.com/images/chrome_search/google_logo.png", 1085 "https://www.google.com/images/chrome_search/google_logo.png",
1086 "https://www.google.com/images/chrome_search/google_logo_2x.png", 1086 "https://www.google.com/images/chrome_search/google_logo_2x.png",
1087 }; 1087 };
1088 1088
1089 1089
1090 //////////////////////////////////////////////////////////////////////////////// 1090 ////////////////////////////////////////////////////////////////////////////////
1091 1091
1092 void RegisterUserPrefs(user_prefs::PrefRegistrySyncable* registry) { 1092 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
1093 registry->RegisterIntegerPref( 1093 registry->RegisterIntegerPref(
1094 prefs::kCountryIDAtInstall, 1094 prefs::kCountryIDAtInstall,
1095 kCountryIDUnknown, 1095 kCountryIDUnknown,
1096 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 1096 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
1097 registry->RegisterListPref(prefs::kSearchProviderOverrides, 1097 registry->RegisterListPref(prefs::kSearchProviderOverrides,
1098 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 1098 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
1099 registry->RegisterIntegerPref( 1099 registry->RegisterIntegerPref(
1100 prefs::kSearchProviderOverridesVersion, 1100 prefs::kSearchProviderOverridesVersion,
1101 -1, 1101 -1,
1102 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 1102 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
1301 GURL GetLogoURL(const TemplateURL& template_url, LogoSize size) { 1301 GURL GetLogoURL(const TemplateURL& template_url, LogoSize size) {
1302 if (GetEngineType(template_url.url()) == SEARCH_ENGINE_GOOGLE) { 1302 if (GetEngineType(template_url.url()) == SEARCH_ENGINE_GOOGLE) {
1303 return GURL((size == LOGO_200_PERCENT) ? 1303 return GURL((size == LOGO_200_PERCENT) ?
1304 google_logos.logo_200_percent_url : 1304 google_logos.logo_200_percent_url :
1305 google_logos.logo_100_percent_url); 1305 google_logos.logo_100_percent_url);
1306 } 1306 }
1307 return GURL(); 1307 return GURL();
1308 } 1308 }
1309 1309
1310 } // namespace TemplateURLPrepopulateData 1310 } // namespace TemplateURLPrepopulateData
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698