OLD | NEW |
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 Loading... |
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 fallback_default_search_.get(); | 131 return TemplateURLService::fallback_search_engines_disabled() ? |
| 132 NULL : fallback_default_search_.get(); |
132 } | 133 } |
133 | 134 |
134 DefaultSearchManager::Source | 135 DefaultSearchManager::Source |
135 DefaultSearchManager::GetDefaultSearchEngineSource() const { | 136 DefaultSearchManager::GetDefaultSearchEngineSource() const { |
136 Source source; | 137 Source source; |
137 GetDefaultSearchEngine(&source); | 138 GetDefaultSearchEngine(&source); |
138 return source; | 139 return source; |
139 } | 140 } |
140 | 141 |
141 void DefaultSearchManager::SetUserSelectedDefaultSearchEngine( | 142 void DefaultSearchManager::SetUserSelectedDefaultSearchEngine( |
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
396 MergePrefsDataWithPrepopulated(); | 397 MergePrefsDataWithPrepopulated(); |
397 } | 398 } |
398 | 399 |
399 void DefaultSearchManager::NotifyObserver() { | 400 void DefaultSearchManager::NotifyObserver() { |
400 if (!change_observer_.is_null()) { | 401 if (!change_observer_.is_null()) { |
401 Source source = FROM_FALLBACK; | 402 Source source = FROM_FALLBACK; |
402 TemplateURLData* data = GetDefaultSearchEngine(&source); | 403 TemplateURLData* data = GetDefaultSearchEngine(&source); |
403 change_observer_.Run(data, source); | 404 change_observer_.Run(data, source); |
404 } | 405 } |
405 } | 406 } |
OLD | NEW |