Add an extension override bubble and warning box for proxy extensions.

chrome/browser/extensions/settings_api_helpers.cc

Index: chrome/browser/extensions/settings_api_helpers.cc
diff --git a/chrome/browser/extensions/settings_api_helpers.cc b/chrome/browser/extensions/settings_api_helpers.cc
index 839098cbd4b0814000c3a36dc0a7a9ef4bb98871..4129b5ce1d98b78cb1e0d12ae499d706af8300db 100644
--- a/chrome/browser/extensions/settings_api_helpers.cc
+++ b/chrome/browser/extensions/settings_api_helpers.cc
@@ -6,6 +6,8 @@
 
 #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"
 
@@ -100,4 +102,13 @@ const Extension* OverridesSearchEngine(
   return extension;
 }
 
+const Extension* OverridesProxy(content::BrowserContext* browser_context) {
+  ExtensionPrefValueMap* extension_prefs_value_map =
+      ExtensionPrefValueMapFactory::GetForBrowserContext(browser_context);
+  std::string extension_id =
+      extension_prefs_value_map->GetExtensionControllingPref(prefs::kProxy);
+  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.

+      extension_id, ExtensionRegistry::ENABLED);
+}
+
 }  // namespace extensions