| OLD | NEW |
| 1 // Copyright (c) 2014 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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/extensions/settings_api_helpers.h" | 5 #include "chrome/browser/extensions/settings_api_helpers.h" |
| 6 | 6 |
| 7 #include "chrome/browser/extensions/api/preference/preference_api.h" | 7 #include "chrome/browser/extensions/api/preference/preference_api.h" |
| 8 #include "chrome/common/pref_names.h" | 8 #include "chrome/common/pref_names.h" |
| 9 #include "extensions/browser/extension_registry.h" | 9 #include "extensions/browser/extension_registry.h" |
| 10 #include "extensions/common/extension_set.h" | 10 #include "extensions/common/extension_set.h" |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 startup_pages->clear(); | 81 startup_pages->clear(); |
| 82 for (std::vector<GURL>::const_iterator it = settings->startup_pages.begin(); | 82 for (std::vector<GURL>::const_iterator it = settings->startup_pages.begin(); |
| 83 it != settings->startup_pages.end(); | 83 it != settings->startup_pages.end(); |
| 84 ++it) | 84 ++it) |
| 85 startup_pages->push_back(GURL(*it)); | 85 startup_pages->push_back(GURL(*it)); |
| 86 } | 86 } |
| 87 return extension; | 87 return extension; |
| 88 } | 88 } |
| 89 | 89 |
| 90 const Extension* OverridesSearchEngine( | 90 const Extension* OverridesSearchEngine( |
| 91 content::BrowserContext* browser_context, | 91 content::BrowserContext* browser_context) { |
| 92 api::manifest_types::ChromeSettingsOverrides::Search_provider* | |
| 93 search_provider) { | |
| 94 const extensions::Extension* extension = NULL; | 92 const extensions::Extension* extension = NULL; |
| 95 const extensions::SettingsOverrides* settings = | 93 FindOverridingExtension( |
| 96 FindOverridingExtension( | 94 browser_context, BUBBLE_TYPE_SEARCH_ENGINE, &extension); |
| 97 browser_context, BUBBLE_TYPE_SEARCH_ENGINE, &extension); | |
| 98 if (settings && search_provider) | |
| 99 search_provider = settings->search_engine.get(); | |
| 100 return extension; | 95 return extension; |
| 101 } | 96 } |
| 102 | 97 |
| 103 } // namespace extensions | 98 } // namespace extensions |
| OLD | NEW |