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

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

Issue 280113002: Revert of Use the DefaultSearchManager as the exclusive authority on DSE, ignoring Web Data. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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"
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 return extension_default_search_.get(); 121 return extension_default_search_.get();
122 } 122 }
123 if (prefs_default_search_) { 123 if (prefs_default_search_) {
124 if (source) 124 if (source)
125 *source = FROM_USER; 125 *source = FROM_USER;
126 return prefs_default_search_.get(); 126 return prefs_default_search_.get();
127 } 127 }
128 128
129 if (source) 129 if (source)
130 *source = FROM_FALLBACK; 130 *source = FROM_FALLBACK;
131 return TemplateURLService::fallback_search_engines_disabled() ? 131 return fallback_default_search_.get();
132 NULL : fallback_default_search_.get();
133 } 132 }
134 133
135 DefaultSearchManager::Source 134 DefaultSearchManager::Source
136 DefaultSearchManager::GetDefaultSearchEngineSource() const { 135 DefaultSearchManager::GetDefaultSearchEngineSource() const {
137 Source source; 136 Source source;
138 GetDefaultSearchEngine(&source); 137 GetDefaultSearchEngine(&source);
139 return source; 138 return source;
140 } 139 }
141 140
142 void DefaultSearchManager::SetUserSelectedDefaultSearchEngine( 141 void DefaultSearchManager::SetUserSelectedDefaultSearchEngine(
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
397 MergePrefsDataWithPrepopulated(); 396 MergePrefsDataWithPrepopulated();
398 } 397 }
399 398
400 void DefaultSearchManager::NotifyObserver() { 399 void DefaultSearchManager::NotifyObserver() {
401 if (!change_observer_.is_null()) { 400 if (!change_observer_.is_null()) {
402 Source source = FROM_FALLBACK; 401 Source source = FROM_FALLBACK;
403 TemplateURLData* data = GetDefaultSearchEngine(&source); 402 TemplateURLData* data = GetDefaultSearchEngine(&source);
404 change_observer_.Run(data, source); 403 change_observer_.Run(data, source);
405 } 404 }
406 } 405 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698