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

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

Issue 335703005: Remove redandunt chrome/common include from chrome/browser/search_engines (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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 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 "chrome/browser/search_engines/default_search_manager.h" 5 #include "chrome/browser/search_engines/default_search_manager.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/bind_helpers.h" 11 #include "base/bind_helpers.h"
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/i18n/case_conversion.h" 13 #include "base/i18n/case_conversion.h"
14 #include "base/logging.h" 14 #include "base/logging.h"
15 #include "base/prefs/pref_service.h" 15 #include "base/prefs/pref_service.h"
16 #include "base/prefs/pref_value_map.h" 16 #include "base/prefs/pref_value_map.h"
17 #include "base/stl_util.h" 17 #include "base/stl_util.h"
18 #include "base/strings/string_number_conversions.h" 18 #include "base/strings/string_number_conversions.h"
19 #include "base/strings/string_split.h" 19 #include "base/strings/string_split.h"
20 #include "base/strings/string_util.h" 20 #include "base/strings/string_util.h"
21 #include "base/strings/utf_string_conversions.h" 21 #include "base/strings/utf_string_conversions.h"
22 #include "base/time/time.h" 22 #include "base/time/time.h"
23 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" 23 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
24 #include "chrome/common/pref_names.h"
25 #include "components/pref_registry/pref_registry_syncable.h" 24 #include "components/pref_registry/pref_registry_syncable.h"
25 #include "components/search_engines/search_engines_pref_names.h"
26 #include "components/search_engines/template_url_data.h" 26 #include "components/search_engines/template_url_data.h"
27 27
28 namespace { 28 namespace {
29 29
30 bool g_fallback_search_engines_disabled = false; 30 bool g_fallback_search_engines_disabled = false;
31 31
32 } // namespace 32 } // namespace
33 33
34 // A dictionary to hold all data related to the Default Search Engine. 34 // A dictionary to hold all data related to the Default Search Engine.
35 // Eventually, this should replace all the data stored in the 35 // Eventually, this should replace all the data stored in the
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after
406 MergePrefsDataWithPrepopulated(); 406 MergePrefsDataWithPrepopulated();
407 } 407 }
408 408
409 void DefaultSearchManager::NotifyObserver() { 409 void DefaultSearchManager::NotifyObserver() {
410 if (!change_observer_.is_null()) { 410 if (!change_observer_.is_null()) {
411 Source source = FROM_FALLBACK; 411 Source source = FROM_FALLBACK;
412 TemplateURLData* data = GetDefaultSearchEngine(&source); 412 TemplateURLData* data = GetDefaultSearchEngine(&source);
413 change_observer_.Run(data, source); 413 change_observer_.Run(data, source);
414 } 414 }
415 } 415 }
OLDNEW
« no previous file with comments | « chrome/browser/profile_resetter/profile_resetter.cc ('k') | chrome/browser/search_engines/default_search_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698