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

Unified Diff: trunk/src/chrome/browser/extensions/settings_api_helpers.cc

Issue 312403003: Revert 275229 "Add an extension override bubble and warning box ..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 6 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
Index: trunk/src/chrome/browser/extensions/settings_api_helpers.cc
===================================================================
--- trunk/src/chrome/browser/extensions/settings_api_helpers.cc (revision 275254)
+++ trunk/src/chrome/browser/extensions/settings_api_helpers.cc (working copy)
@@ -6,24 +6,23 @@
#include "chrome/browser/extensions/api/preference/preference_api.h"
#include "chrome/common/pref_names.h"
-#include "extensions/browser/extension_pref_value_map.h"
-#include "extensions/browser/extension_pref_value_map_factory.h"
#include "extensions/browser/extension_registry.h"
#include "extensions/common/extension_set.h"
namespace extensions {
-const SettingsOverrides* FindOverridingExtension(
+const extensions::SettingsOverrides* FindOverridingExtension(
content::BrowserContext* browser_context,
SettingsApiOverrideType type,
const Extension** extension) {
- const ExtensionSet& extensions =
- ExtensionRegistry::Get(browser_context)->enabled_extensions();
+ const extensions::ExtensionSet& extensions =
+ extensions::ExtensionRegistry::Get(browser_context)->enabled_extensions();
- for (ExtensionSet::const_iterator it = extensions.begin();
+ for (extensions::ExtensionSet::const_iterator it = extensions.begin();
it != extensions.end();
++it) {
- const SettingsOverrides* settings = SettingsOverrides::Get(*it);
+ const extensions::SettingsOverrides* settings =
+ extensions::SettingsOverrides::Get(*it);
if (settings) {
if (type == BUBBLE_TYPE_HOME_PAGE && !settings->homepage)
continue;
@@ -60,10 +59,10 @@
return NULL;
}
-const Extension* GetExtensionOverridingHomepage(
- content::BrowserContext* browser_context, GURL* home_page_url) {
- const Extension* extension = NULL;
- const SettingsOverrides* settings =
+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);
@@ -72,11 +71,10 @@
return extension;
}
-const Extension* GetExtensionOverridingStartupPages(
- content::BrowserContext* browser_context,
- std::vector<GURL>* startup_pages) {
- const Extension* extension = NULL;
- const SettingsOverrides* settings =
+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) {
@@ -89,12 +87,12 @@
return extension;
}
-const Extension* GetExtensionOverridingSearchEngine(
+const Extension* OverridesSearchEngine(
content::BrowserContext* browser_context,
api::manifest_types::ChromeSettingsOverrides::Search_provider*
search_provider) {
- const Extension* extension = NULL;
- const SettingsOverrides* settings =
+ const extensions::Extension* extension = NULL;
+ const extensions::SettingsOverrides* settings =
FindOverridingExtension(
browser_context, BUBBLE_TYPE_SEARCH_ENGINE, &extension);
if (settings && search_provider)
@@ -102,16 +100,4 @@
return extension;
}
-const Extension* GetExtensionOverridingProxy(
- content::BrowserContext* browser_context) {
- ExtensionPrefValueMap* extension_prefs_value_map =
- ExtensionPrefValueMapFactory::GetForBrowserContext(browser_context);
- std::string extension_id =
- extension_prefs_value_map->GetExtensionControllingPref(prefs::kProxy);
- if (extension_id.empty())
- return NULL;
- return ExtensionRegistry::Get(browser_context)->GetExtensionById(
- extension_id, ExtensionRegistry::ENABLED);
-}
-
} // namespace extensions

Powered by Google App Engine
This is Rietveld 408576698