| Index: chrome/browser/extensions/settings_api_helpers.h
|
| diff --git a/chrome/browser/extensions/settings_api_helpers.h b/chrome/browser/extensions/settings_api_helpers.h
|
| index 866fbb14997dfcdae23052a55e2deac57f8d7b5b..647782d16547e830db11ab6cf35268a0618dce88 100644
|
| --- a/chrome/browser/extensions/settings_api_helpers.h
|
| +++ b/chrome/browser/extensions/settings_api_helpers.h
|
| @@ -13,43 +13,23 @@ class BrowserContext;
|
|
|
| namespace extensions {
|
|
|
| -struct SettingsOverrides;
|
| -
|
| -// Find which |extension| is overriding a particular |type| of setting. Returns
|
| -// the SettingsOverride object, or NULL if no |extension| is overriding that
|
| -// particular setting.
|
| -const extensions::SettingsOverrides* FindOverridingExtension(
|
| - content::BrowserContext* browser_context,
|
| - SettingsApiOverrideType type,
|
| - const Extension** extension);
|
| -
|
| -// Returns which extension is overriding the homepage in a given
|
| -// |browser_context| or NULL if no extension is overriding the homepage.
|
| -// |home_page_url|, if non-NULL, will contain the home_page value the extension
|
| -// has set.
|
| +// Returns which extension (if any) is overriding the homepage in a given
|
| +// |browser_context|.
|
| const Extension* GetExtensionOverridingHomepage(
|
| - content::BrowserContext* browser_context,
|
| - GURL* home_page_url);
|
| + content::BrowserContext* browser_context);
|
|
|
| -// Returns which extension is overriding the homepage in a given
|
| -// |browser_context| or NULL if no extension is overriding the startup pages.
|
| -// |startup_pages|, if non-NULL, will contain the vector of startup page URLs
|
| -// the extension has set.
|
| +// Returns which extension (if any) is overriding the homepage in a given
|
| +// |browser_context|.
|
| const Extension* GetExtensionOverridingStartupPages(
|
| - content::BrowserContext* browser_context,
|
| - std::vector<GURL>* startup_pages);
|
| + content::BrowserContext* browser_context);
|
|
|
| -// Returns which extension is overriding the search engine in a given
|
| -// |browser_context| or NULL if no extension is overriding the search engine.
|
| -// |search_provider|, if non-NULL, will contain the search provider the
|
| -// extension has set.
|
| +// Returns which extension (if any) is overriding the search engine in a given
|
| +// |browser_context|.
|
| const Extension* GetExtensionOverridingSearchEngine(
|
| - content::BrowserContext* browser_context,
|
| - api::manifest_types::ChromeSettingsOverrides::Search_provider*
|
| - search_provider);
|
| + content::BrowserContext* browser_context);
|
|
|
| -// Returns which extension is overriding the proxy in a given |browser_context|
|
| -// or NULL if no extension is overriding the proxy.
|
| +// Returns which extension (if any) is overriding the proxy in a given
|
| +// |browser_context|.
|
| const Extension* GetExtensionOverridingProxy(
|
| content::BrowserContext* browser_context);
|
|
|
|
|