OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/extensions/api/settings_overrides/settings_overrides_ap
i.h" | 5 #include "chrome/browser/extensions/api/settings_overrides/settings_overrides_ap
i.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/lazy_instance.h" | 10 #include "base/lazy_instance.h" |
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
229 if (settings) { | 229 if (settings) { |
230 if (settings->homepage) { | 230 if (settings->homepage) { |
231 UnsetPref(extension->id(), prefs::kHomePage); | 231 UnsetPref(extension->id(), prefs::kHomePage); |
232 UnsetPref(extension->id(), prefs::kHomePageIsNewTabPage); | 232 UnsetPref(extension->id(), prefs::kHomePageIsNewTabPage); |
233 } | 233 } |
234 if (!settings->startup_pages.empty()) { | 234 if (!settings->startup_pages.empty()) { |
235 UnsetPref(extension->id(), prefs::kRestoreOnStartup); | 235 UnsetPref(extension->id(), prefs::kRestoreOnStartup); |
236 UnsetPref(extension->id(), prefs::kURLsToRestoreOnStartup); | 236 UnsetPref(extension->id(), prefs::kURLsToRestoreOnStartup); |
237 } | 237 } |
238 if (settings->search_engine) { | 238 if (settings->search_engine) { |
| 239 if (settings->search_engine->is_default) { |
| 240 // Current extension can be overriding DSE. |
| 241 UnsetPref(extension->id(), |
| 242 DefaultSearchManager::kDefaultSearchProviderDataPrefName); |
| 243 } |
239 DCHECK(url_service_); | 244 DCHECK(url_service_); |
240 if (url_service_->loaded()) { | 245 if (url_service_->loaded()) { |
241 url_service_->RemoveExtensionControlledTURL( | 246 url_service_->RemoveExtensionControlledTURL( |
242 extension->id(), TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION); | 247 extension->id(), TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION); |
243 } else { | 248 } else { |
244 pending_extensions_.erase(extension); | 249 pending_extensions_.erase(extension); |
245 } | 250 } |
246 } | 251 } |
247 } | 252 } |
248 } | 253 } |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
286 | 291 |
287 template <> | 292 template <> |
288 void BrowserContextKeyedAPIFactory< | 293 void BrowserContextKeyedAPIFactory< |
289 SettingsOverridesAPI>::DeclareFactoryDependencies() { | 294 SettingsOverridesAPI>::DeclareFactoryDependencies() { |
290 DependsOn(ExtensionPrefsFactory::GetInstance()); | 295 DependsOn(ExtensionPrefsFactory::GetInstance()); |
291 DependsOn(PreferenceAPI::GetFactoryInstance()); | 296 DependsOn(PreferenceAPI::GetFactoryInstance()); |
292 DependsOn(TemplateURLServiceFactory::GetInstance()); | 297 DependsOn(TemplateURLServiceFactory::GetInstance()); |
293 } | 298 } |
294 | 299 |
295 } // namespace extensions | 300 } // namespace extensions |
OLD | NEW |