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

Side by Side Diff: chrome/browser/extensions/settings_api_helpers.cc

Issue 288923004: Add an extension override bubble and warning box for proxy extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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_pref_value_map.h"
10 #include "extensions/browser/extension_pref_value_map_factory.h"
9 #include "extensions/browser/extension_registry.h" 11 #include "extensions/browser/extension_registry.h"
10 #include "extensions/common/extension_set.h" 12 #include "extensions/common/extension_set.h"
11 13
12 namespace extensions { 14 namespace extensions {
13 15
14 const extensions::SettingsOverrides* FindOverridingExtension( 16 const extensions::SettingsOverrides* FindOverridingExtension(
15 content::BrowserContext* browser_context, 17 content::BrowserContext* browser_context,
16 SettingsApiOverrideType type, 18 SettingsApiOverrideType type,
17 const Extension** extension) { 19 const Extension** extension) {
18 const extensions::ExtensionSet& extensions = 20 const extensions::ExtensionSet& extensions =
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 search_provider) { 95 search_provider) {
94 const extensions::Extension* extension = NULL; 96 const extensions::Extension* extension = NULL;
95 const extensions::SettingsOverrides* settings = 97 const extensions::SettingsOverrides* settings =
96 FindOverridingExtension( 98 FindOverridingExtension(
97 browser_context, BUBBLE_TYPE_SEARCH_ENGINE, &extension); 99 browser_context, BUBBLE_TYPE_SEARCH_ENGINE, &extension);
98 if (settings && search_provider) 100 if (settings && search_provider)
99 search_provider = settings->search_engine.get(); 101 search_provider = settings->search_engine.get();
100 return extension; 102 return extension;
101 } 103 }
102 104
105 const Extension* OverridesProxy(content::BrowserContext* browser_context) {
106 ExtensionPrefValueMap* extension_prefs_value_map =
107 ExtensionPrefValueMapFactory::GetForBrowserContext(browser_context);
108 std::string extension_id =
109 extension_prefs_value_map->GetExtensionControllingPref(prefs::kProxy);
110 return extensions::ExtensionRegistry::Get(browser_context)->GetExtensionById(
Devlin 2014/05/20 17:26:31 nit: no extensions:: prefix.
Finnur 2014/05/21 16:30:32 Done.
111 extension_id, ExtensionRegistry::ENABLED);
112 }
113
103 } // namespace extensions 114 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698