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

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

Issue 355853002: Componentize TemplateURLPrepopulateData, DefaultSearchManager and DefaultSearchPolicyHandler (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Missing comma in gyp Created 6 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_service.h" 5 #include "chrome/browser/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 12 matching lines...) Expand all
23 #include "base/strings/utf_string_conversions.h" 23 #include "base/strings/utf_string_conversions.h"
24 #include "base/time/time.h" 24 #include "base/time/time.h"
25 #include "chrome/browser/chrome_notification_types.h" 25 #include "chrome/browser/chrome_notification_types.h"
26 #include "chrome/browser/google/google_url_tracker_factory.h" 26 #include "chrome/browser/google/google_url_tracker_factory.h"
27 #include "chrome/browser/history/history_service.h" 27 #include "chrome/browser/history/history_service.h"
28 #include "chrome/browser/history/history_service_factory.h" 28 #include "chrome/browser/history/history_service_factory.h"
29 #include "chrome/browser/metrics/rappor/sampling.h" 29 #include "chrome/browser/metrics/rappor/sampling.h"
30 #include "chrome/browser/profiles/profile.h" 30 #include "chrome/browser/profiles/profile.h"
31 #include "chrome/browser/rlz/rlz.h" 31 #include "chrome/browser/rlz/rlz.h"
32 #include "chrome/browser/search_engines/search_host_to_urls_map.h" 32 #include "chrome/browser/search_engines/search_host_to_urls_map.h"
33 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
34 #include "chrome/browser/search_engines/template_url_service_observer.h" 33 #include "chrome/browser/search_engines/template_url_service_observer.h"
35 #include "chrome/browser/search_engines/ui_thread_search_terms_data.h" 34 #include "chrome/browser/search_engines/ui_thread_search_terms_data.h"
36 #include "chrome/browser/search_engines/util.h" 35 #include "chrome/browser/search_engines/util.h"
37 #include "chrome/browser/webdata/web_data_service.h" 36 #include "chrome/browser/webdata/web_data_service.h"
38 #include "chrome/common/env_vars.h" 37 #include "chrome/common/env_vars.h"
39 #include "components/search_engines/search_engines_pref_names.h" 38 #include "components/search_engines/search_engines_pref_names.h"
40 #include "components/search_engines/template_url.h" 39 #include "components/search_engines/template_url.h"
40 #include "components/search_engines/template_url_prepopulate_data.h"
41 #include "components/url_fixer/url_fixer.h" 41 #include "components/url_fixer/url_fixer.h"
42 #include "content/public/browser/notification_service.h" 42 #include "content/public/browser/notification_service.h"
43 #include "extensions/common/constants.h" 43 #include "extensions/common/constants.h"
44 #include "net/base/net_util.h" 44 #include "net/base/net_util.h"
45 #include "sync/api/sync_change.h" 45 #include "sync/api/sync_change.h"
46 #include "sync/api/sync_error_factory.h" 46 #include "sync/api/sync_error_factory.h"
47 #include "sync/protocol/search_engine_specifics.pb.h" 47 #include "sync/protocol/search_engine_specifics.pb.h"
48 #include "sync/protocol/sync.pb.h" 48 #include "sync/protocol/sync.pb.h"
49 #include "ui/base/l10n/l10n_util.h" 49 #include "ui/base/l10n/l10n_util.h"
50 #include "url/gurl.h" 50 #include "url/gurl.h"
(...skipping 2422 matching lines...) Expand 10 before | Expand all | Expand 10 after
2473 2473
2474 if (most_recently_intalled_default) { 2474 if (most_recently_intalled_default) {
2475 base::AutoReset<DefaultSearchChangeOrigin> change_origin( 2475 base::AutoReset<DefaultSearchChangeOrigin> change_origin(
2476 &dsp_change_origin_, DSP_CHANGE_OVERRIDE_SETTINGS_EXTENSION); 2476 &dsp_change_origin_, DSP_CHANGE_OVERRIDE_SETTINGS_EXTENSION);
2477 default_search_manager_.SetExtensionControlledDefaultSearchEngine( 2477 default_search_manager_.SetExtensionControlledDefaultSearchEngine(
2478 most_recently_intalled_default->data()); 2478 most_recently_intalled_default->data());
2479 } else { 2479 } else {
2480 default_search_manager_.ClearExtensionControlledDefaultSearchEngine(); 2480 default_search_manager_.ClearExtensionControlledDefaultSearchEngine();
2481 } 2481 }
2482 } 2482 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698