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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1296663003: Componentize proxy code from chrome/browser/net (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: updated build errors Created 5 years, 4 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
« chrome/browser/extensions/extension_message_bubble_controller_unittest.cc ('K') | « chrome/browser/extensions/extension_message_bubble_controller_unittest.cc ('k') | chrome/browser/io_thread.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 2fcd9c8670c4f0c7dc0818e21bd8d8ad3342453b..5ad7344f4b5999e274d2910a41308155cc04ab20 100644
--- a/chrome/browser/extensions/settings_api_helpers.cc
+++ b/chrome/browser/extensions/settings_api_helpers.cc
@@ -6,6 +6,7 @@
#include "chrome/browser/extensions/api/preference/preference_api.h"
#include "chrome/common/pref_names.h"
+#include "components/proxy_config/proxy_config_pref_names.h"
#include "components/search_engines/search_engines_pref_names.h"
#include "extensions/browser/extension_pref_value_map.h"
#include "extensions/browser/extension_pref_value_map_factory.h"
@@ -87,7 +88,8 @@ const Extension* GetExtensionOverridingProxy(
if (!extension_prefs_value_map)
return NULL; // Can be null during testing.
std::string extension_id =
- extension_prefs_value_map->GetExtensionControllingPref(prefs::kProxy);
+ extension_prefs_value_map->GetExtensionControllingPref(
+ ProxyPrefs::prefs::kProxy);
if (extension_id.empty())
return NULL;
return ExtensionRegistry::Get(browser_context)->GetExtensionById(
« chrome/browser/extensions/extension_message_bubble_controller_unittest.cc ('K') | « chrome/browser/extensions/extension_message_bubble_controller_unittest.cc ('k') | chrome/browser/io_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698