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

Side by Side Diff: components/search_engines/template_url_service.cc

Issue 2598033004: Remove old default search preferences. (Closed)
Patch Set: Updated histograms.xml Created 3 years, 12 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "components/search_engines/template_url_service.h" 5 #include "components/search_engines/template_url_service.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 uint32_t flags = PrefRegistry::NO_REGISTRATION_FLAGS; 295 uint32_t flags = PrefRegistry::NO_REGISTRATION_FLAGS;
296 #else 296 #else
297 uint32_t flags = user_prefs::PrefRegistrySyncable::SYNCABLE_PREF; 297 uint32_t flags = user_prefs::PrefRegistrySyncable::SYNCABLE_PREF;
298 #endif 298 #endif
299 registry->RegisterStringPref(prefs::kSyncedDefaultSearchProviderGUID, 299 registry->RegisterStringPref(prefs::kSyncedDefaultSearchProviderGUID,
300 std::string(), 300 std::string(),
301 flags); 301 flags);
302 registry->RegisterBooleanPref(prefs::kDefaultSearchProviderEnabled, true); 302 registry->RegisterBooleanPref(prefs::kDefaultSearchProviderEnabled, true);
303 registry->RegisterStringPref(prefs::kDefaultSearchProviderName, 303 registry->RegisterStringPref(prefs::kDefaultSearchProviderName,
304 std::string()); 304 std::string());
305 registry->RegisterStringPref(prefs::kDefaultSearchProviderID, std::string());
306 registry->RegisterStringPref(prefs::kDefaultSearchProviderPrepopulateID,
307 std::string());
308 registry->RegisterStringPref(prefs::kDefaultSearchProviderSuggestURL,
309 std::string());
310 registry->RegisterStringPref(prefs::kDefaultSearchProviderSearchURL, 305 registry->RegisterStringPref(prefs::kDefaultSearchProviderSearchURL,
311 std::string()); 306 std::string());
312 registry->RegisterStringPref(prefs::kDefaultSearchProviderInstantURL,
313 std::string());
314 registry->RegisterStringPref(prefs::kDefaultSearchProviderImageURL,
315 std::string());
316 registry->RegisterStringPref(prefs::kDefaultSearchProviderNewTabURL,
317 std::string());
318 registry->RegisterStringPref(prefs::kDefaultSearchProviderSearchURLPostParams,
319 std::string());
320 registry->RegisterStringPref(
321 prefs::kDefaultSearchProviderSuggestURLPostParams, std::string());
322 registry->RegisterStringPref(
323 prefs::kDefaultSearchProviderInstantURLPostParams, std::string());
324 registry->RegisterStringPref(prefs::kDefaultSearchProviderImageURLPostParams,
325 std::string());
326 registry->RegisterStringPref(prefs::kDefaultSearchProviderKeyword, 307 registry->RegisterStringPref(prefs::kDefaultSearchProviderKeyword,
327 std::string()); 308 std::string());
328 registry->RegisterStringPref(prefs::kDefaultSearchProviderIconURL,
329 std::string());
330 registry->RegisterStringPref(prefs::kDefaultSearchProviderEncodings,
331 std::string());
332 registry->RegisterListPref(prefs::kDefaultSearchProviderAlternateURLs);
333 registry->RegisterStringPref(
334 prefs::kDefaultSearchProviderSearchTermsReplacementKey, std::string());
335 } 309 }
336 310
337 // static 311 // static
338 base::string16 TemplateURLService::CleanUserInputKeyword( 312 base::string16 TemplateURLService::CleanUserInputKeyword(
339 const base::string16& keyword) { 313 const base::string16& keyword) {
340 // Remove the scheme. 314 // Remove the scheme.
341 base::string16 result(base::i18n::ToLower(keyword)); 315 base::string16 result(base::i18n::ToLower(keyword));
342 base::TrimWhitespace(result, base::TRIM_ALL, &result); 316 base::TrimWhitespace(result, base::TRIM_ALL, &result);
343 url::Component scheme_component; 317 url::Component scheme_component;
344 if (url::ExtractScheme(base::UTF16ToUTF8(keyword).c_str(), 318 if (url::ExtractScheme(base::UTF16ToUTF8(keyword).c_str(),
(...skipping 2169 matching lines...) Expand 10 before | Expand all | Expand 10 after
2514 2488
2515 if (most_recently_intalled_default) { 2489 if (most_recently_intalled_default) {
2516 base::AutoReset<DefaultSearchChangeOrigin> change_origin( 2490 base::AutoReset<DefaultSearchChangeOrigin> change_origin(
2517 &dsp_change_origin_, DSP_CHANGE_OVERRIDE_SETTINGS_EXTENSION); 2491 &dsp_change_origin_, DSP_CHANGE_OVERRIDE_SETTINGS_EXTENSION);
2518 default_search_manager_.SetExtensionControlledDefaultSearchEngine( 2492 default_search_manager_.SetExtensionControlledDefaultSearchEngine(
2519 most_recently_intalled_default->data()); 2493 most_recently_intalled_default->data());
2520 } else { 2494 } else {
2521 default_search_manager_.ClearExtensionControlledDefaultSearchEngine(); 2495 default_search_manager_.ClearExtensionControlledDefaultSearchEngine();
2522 } 2496 }
2523 } 2497 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698