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

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

Issue 1651203002: Update components for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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
« no previous file with comments | « components/search_engines/template_url_service.h ('k') | components/search_engines/util.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/guid.h" 13 #include "base/guid.h"
14 #include "base/i18n/case_conversion.h" 14 #include "base/i18n/case_conversion.h"
15 #include "base/memory/scoped_vector.h" 15 #include "base/memory/scoped_vector.h"
16 #include "base/metrics/histogram_macros.h" 16 #include "base/metrics/histogram_macros.h"
17 #include "base/prefs/pref_service.h"
18 #include "base/profiler/scoped_tracker.h" 17 #include "base/profiler/scoped_tracker.h"
19 #include "base/stl_util.h" 18 #include "base/stl_util.h"
20 #include "base/strings/string_split.h" 19 #include "base/strings/string_split.h"
21 #include "base/strings/string_util.h" 20 #include "base/strings/string_util.h"
22 #include "base/strings/utf_string_conversions.h" 21 #include "base/strings/utf_string_conversions.h"
23 #include "base/time/default_clock.h" 22 #include "base/time/default_clock.h"
24 #include "base/time/time.h" 23 #include "base/time/time.h"
25 #include "components/omnibox/browser/omnibox_field_trial.h" 24 #include "components/omnibox/browser/omnibox_field_trial.h"
26 #include "components/pref_registry/pref_registry_syncable.h" 25 #include "components/pref_registry/pref_registry_syncable.h"
26 #include "components/prefs/pref_service.h"
27 #include "components/rappor/rappor_service.h" 27 #include "components/rappor/rappor_service.h"
28 #include "components/search_engines/search_engines_pref_names.h" 28 #include "components/search_engines/search_engines_pref_names.h"
29 #include "components/search_engines/search_host_to_urls_map.h" 29 #include "components/search_engines/search_host_to_urls_map.h"
30 #include "components/search_engines/search_terms_data.h" 30 #include "components/search_engines/search_terms_data.h"
31 #include "components/search_engines/template_url.h" 31 #include "components/search_engines/template_url.h"
32 #include "components/search_engines/template_url_prepopulate_data.h" 32 #include "components/search_engines/template_url_prepopulate_data.h"
33 #include "components/search_engines/template_url_service_client.h" 33 #include "components/search_engines/template_url_service_client.h"
34 #include "components/search_engines/template_url_service_observer.h" 34 #include "components/search_engines/template_url_service_observer.h"
35 #include "components/search_engines/util.h" 35 #include "components/search_engines/util.h"
36 #include "components/url_formatter/url_fixer.h" 36 #include "components/url_formatter/url_fixer.h"
(...skipping 2399 matching lines...) Expand 10 before | Expand all | Expand 10 after
2436 2436
2437 if (most_recently_intalled_default) { 2437 if (most_recently_intalled_default) {
2438 base::AutoReset<DefaultSearchChangeOrigin> change_origin( 2438 base::AutoReset<DefaultSearchChangeOrigin> change_origin(
2439 &dsp_change_origin_, DSP_CHANGE_OVERRIDE_SETTINGS_EXTENSION); 2439 &dsp_change_origin_, DSP_CHANGE_OVERRIDE_SETTINGS_EXTENSION);
2440 default_search_manager_.SetExtensionControlledDefaultSearchEngine( 2440 default_search_manager_.SetExtensionControlledDefaultSearchEngine(
2441 most_recently_intalled_default->data()); 2441 most_recently_intalled_default->data());
2442 } else { 2442 } else {
2443 default_search_manager_.ClearExtensionControlledDefaultSearchEngine(); 2443 default_search_manager_.ClearExtensionControlledDefaultSearchEngine();
2444 } 2444 }
2445 } 2445 }
OLDNEW
« no previous file with comments | « components/search_engines/template_url_service.h ('k') | components/search_engines/util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698