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

Unified Diff: chrome/browser/extensions/api/preference/preference_api.cc

Issue 1296663003: Componentize proxy code from chrome/browser/net (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: updating for win p/f 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
Index: chrome/browser/extensions/api/preference/preference_api.cc
diff --git a/chrome/browser/extensions/api/preference/preference_api.cc b/chrome/browser/extensions/api/preference/preference_api.cc
index ac80eb49dc6e367e9c629ccf8f2cc342deb12a10..a0a248df514f898d589d36d48a55a2a5bbe6d3d2 100644
--- a/chrome/browser/extensions/api/preference/preference_api.cc
+++ b/chrome/browser/extensions/api/preference/preference_api.cc
@@ -23,6 +23,7 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/pref_names.h"
#include "components/content_settings/core/common/pref_names.h"
+#include "components/proxy_config/proxy_config_pref_names.h"
#include "components/translate/core/common/translate_pref_names.h"
#include "content/public/browser/notification_details.h"
#include "content/public/browser/notification_source.h"
@@ -94,7 +95,8 @@ PrefMappingEntry kPrefMapping[] = {
APIPermission::kPrivacy, APIPermission::kPrivacy},
{"protectedContentEnabled", prefs::kEnableDRM, APIPermission::kPrivacy,
APIPermission::kPrivacy},
- {"proxy", prefs::kProxy, APIPermission::kProxy, APIPermission::kProxy},
+ {"proxy", proxy_config::prefs::kProxy, APIPermission::kProxy,
+ APIPermission::kProxy},
{"referrersEnabled", prefs::kEnableReferrers, APIPermission::kPrivacy,
APIPermission::kPrivacy},
{"safeBrowsingEnabled", prefs::kSafeBrowsingEnabled,
@@ -270,7 +272,8 @@ class PrefMapping {
}
DCHECK_EQ(arraysize(kPrefMapping), mapping_.size());
DCHECK_EQ(arraysize(kPrefMapping), event_mapping_.size());
- RegisterPrefTransformer(prefs::kProxy, new ProxyPrefTransformer());
+ RegisterPrefTransformer(proxy_config::prefs::kProxy,
+ new ProxyPrefTransformer());
RegisterPrefTransformer(prefs::kBlockThirdPartyCookies,
new InvertBooleanTransformer());
RegisterPrefTransformer(prefs::kNetworkPredictionOptions,
« no previous file with comments | « chrome/browser/chromeos/ui_proxy_config_service.cc ('k') | chrome/browser/extensions/api/proxy/proxy_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698