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

Unified Diff: chrome/browser/ui/views/settings_api_bubble_helper_views.cc

Issue 219593002: Add unit test for the Settings API Bubble. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Synced Created 6 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/settings_api_bubble_helper_views.h ('k') | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/settings_api_bubble_helper_views.cc
diff --git a/chrome/browser/ui/views/settings_api_bubble_helper_views.cc b/chrome/browser/ui/views/settings_api_bubble_helper_views.cc
index 5a91d26aac44614aed3fd0aea018dd02950c352d..8927342857821c65258ff3f60777538fd1b0974b 100644
--- a/chrome/browser/ui/views/settings_api_bubble_helper_views.cc
+++ b/chrome/browser/ui/views/settings_api_bubble_helper_views.cc
@@ -5,8 +5,7 @@
#include "chrome/browser/ui/views/settings_api_bubble_helper_views.h"
#include "chrome/browser/extensions/settings_api_bubble_controller.h"
-#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/extensions/settings_api_helpers.h"
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/views/extensions/extension_message_bubble_view.h"
#include "chrome/browser/ui/views/frame/browser_view.h"
@@ -14,8 +13,6 @@
#include "chrome/browser/ui/views/toolbar/home_button.h"
#include "chrome/browser/ui/views/toolbar/toolbar_view.h"
#include "chrome/common/extensions/manifest_handlers/settings_overrides_handler.h"
-#include "content/public/browser/browser_context.h"
-#include "extensions/browser/extension_registry.h"
namespace {
@@ -88,70 +85,4 @@ void MaybeShowExtensionControlledSearchNotification(
}
}
-const extensions::SettingsOverrides* FindOverridingExtension(
- content::BrowserContext* browser_context,
- SettingsApiOverrideType type,
- const Extension** extension) {
- const extensions::ExtensionSet& extensions =
- extensions::ExtensionRegistry::Get(browser_context)->enabled_extensions();
-
- for (extensions::ExtensionSet::const_iterator it = extensions.begin();
- it != extensions.end();
- ++it) {
- const extensions::SettingsOverrides* settings =
- extensions::SettingsOverrides::Get(*it);
- if (settings) {
- if ((type == BUBBLE_TYPE_HOME_PAGE && settings->homepage) ||
- (type == BUBBLE_TYPE_STARTUP_PAGES &&
- !settings->startup_pages.empty()) ||
- (type == BUBBLE_TYPE_SEARCH_ENGINE && settings->search_engine)) {
- *extension = *it;
- return settings;
- }
- }
- }
-
- return NULL;
-}
-
-const Extension* OverridesHomepage(content::BrowserContext* browser_context,
- GURL* home_page_url) {
- const extensions::Extension* extension = NULL;
- const extensions::SettingsOverrides* settings =
- FindOverridingExtension(
- browser_context, BUBBLE_TYPE_HOME_PAGE, &extension);
- if (settings && home_page_url)
- *home_page_url = *settings->homepage;
- return extension;
-}
-
-const Extension* OverridesStartupPages(content::BrowserContext* browser_context,
- std::vector<GURL>* startup_pages) {
- const extensions::Extension* extension = NULL;
- const extensions::SettingsOverrides* settings =
- FindOverridingExtension(
- browser_context, BUBBLE_TYPE_STARTUP_PAGES, &extension);
- if (settings && startup_pages) {
- startup_pages->clear();
- for (std::vector<GURL>::const_iterator it = settings->startup_pages.begin();
- it != settings->startup_pages.end();
- ++it)
- startup_pages->push_back(GURL(*it));
- }
- return extension;
-}
-
-const Extension* OverridesSearchEngine(
- content::BrowserContext* browser_context,
- api::manifest_types::ChromeSettingsOverrides::Search_provider*
- search_provider) {
- const extensions::Extension* extension = NULL;
- const extensions::SettingsOverrides* settings =
- FindOverridingExtension(
- browser_context, BUBBLE_TYPE_SEARCH_ENGINE, &extension);
- if (settings && search_provider)
- search_provider = settings->search_engine.get();
- return extension;
-}
-
} // namespace extensions
« no previous file with comments | « chrome/browser/ui/views/settings_api_bubble_helper_views.h ('k') | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698