Chromium Code Reviews| 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/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 1179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1190 engine->GetList("alternate_urls", &alternate_urls); | 1190 engine->GetList("alternate_urls", &alternate_urls); |
| 1191 engine->GetString("search_terms_replacement_key", | 1191 engine->GetString("search_terms_replacement_key", |
| 1192 &search_terms_replacement_key); | 1192 &search_terms_replacement_key); |
| 1193 t_urls->push_back(MakePrepopulatedTemplateURL(profile, name, keyword, | 1193 t_urls->push_back(MakePrepopulatedTemplateURL(profile, name, keyword, |
| 1194 search_url, suggest_url, instant_url, favicon_url, encoding, | 1194 search_url, suggest_url, instant_url, favicon_url, encoding, |
| 1195 *alternate_urls, search_terms_replacement_key, id)); | 1195 *alternate_urls, search_terms_replacement_key, id)); |
| 1196 } | 1196 } |
| 1197 } | 1197 } |
| 1198 } | 1198 } |
| 1199 | 1199 |
| 1200 void ClearPrepopulatedEnginesInPrefs(Profile* profile) { | |
| 1201 if (!profile) | |
| 1202 return; | |
| 1203 | |
| 1204 PrefService* prefs = profile->GetPrefs(); | |
| 1205 DCHECK(prefs); | |
| 1206 const PrefService::Preference* pref = | |
| 1207 prefs->FindPreference(prefs::kSearchProviderOverrides); | |
| 1208 if (pref && pref->HasUserSetting()) { | |
| 1209 ListValue empty_list; | |
| 1210 prefs->Set(prefs::kSearchProviderOverrides, empty_list); | |
|
battre
2013/05/22 14:03:37
Should we use prefs->ClearPref here and in the fol
vasilii
2013/05/22 18:54:08
Done.
| |
| 1211 prefs->SetInteger(prefs::kSearchProviderOverridesVersion, | |
| 1212 kCurrentDataVersion); | |
| 1213 } | |
| 1214 } | |
| 1215 | |
| 1200 // The caller owns the returned TemplateURL. | 1216 // The caller owns the returned TemplateURL. |
| 1201 TemplateURL* MakePrepopulatedTemplateURLFromPrepopulateEngine( | 1217 TemplateURL* MakePrepopulatedTemplateURLFromPrepopulateEngine( |
| 1202 Profile* profile, | 1218 Profile* profile, |
| 1203 const PrepopulatedEngine& engine) { | 1219 const PrepopulatedEngine& engine) { |
| 1204 | 1220 |
| 1205 ListValue alternate_urls; | 1221 ListValue alternate_urls; |
| 1206 if (engine.alternate_urls) { | 1222 if (engine.alternate_urls) { |
| 1207 for (size_t i = 0; i < engine.alternate_urls_size; ++i) | 1223 for (size_t i = 0; i < engine.alternate_urls_size; ++i) |
| 1208 alternate_urls.AppendString(std::string(engine.alternate_urls[i])); | 1224 alternate_urls.AppendString(std::string(engine.alternate_urls[i])); |
| 1209 } | 1225 } |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1291 GURL GetLogoURL(const TemplateURL& template_url, LogoSize size) { | 1307 GURL GetLogoURL(const TemplateURL& template_url, LogoSize size) { |
| 1292 if (GetEngineType(template_url.url()) == SEARCH_ENGINE_GOOGLE) { | 1308 if (GetEngineType(template_url.url()) == SEARCH_ENGINE_GOOGLE) { |
| 1293 return GURL((size == LOGO_200_PERCENT) ? | 1309 return GURL((size == LOGO_200_PERCENT) ? |
| 1294 google_logos.logo_200_percent_url : | 1310 google_logos.logo_200_percent_url : |
| 1295 google_logos.logo_100_percent_url); | 1311 google_logos.logo_100_percent_url); |
| 1296 } | 1312 } |
| 1297 return GURL(); | 1313 return GURL(); |
| 1298 } | 1314 } |
| 1299 | 1315 |
| 1300 } // namespace TemplateURLPrepopulateData | 1316 } // namespace TemplateURLPrepopulateData |
| OLD | NEW |