chrome/browser/extensions/extension_proxy_api_helpers.cc - Issue 8869003: Move the "extension" namespace from extension_api.json into extension_api_extension.json.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 8869003: Move the "extension" namespace from extension_api.json into extension_api_extension.json. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years 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_clear_api.h ('K') | « chrome/browser/extensions/extension_proxy_api.cc ('k') | chrome/browser/extensions/extension_webnavigation_api.h » ('j') | chrome/common/common_resources.grd » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_proxy_api_helpers.cc

diff --git a/chrome/browser/extensions/extension_proxy_api_helpers.cc b/chrome/browser/extensions/extension_proxy_api_helpers.cc

index 6a9e14b274e09ebd9bb887a1d803859597b42e6e..0cf738b34fb2932f4f7bdfd6fc1e2fe3de366aec 100644

--- a/chrome/browser/extensions/extension_proxy_api_helpers.cc

+++ b/chrome/browser/extensions/extension_proxy_api_helpers.cc

@@ -64,7 +64,7 @@ bool GetProxyModeFromExtensionPref(const DictionaryValue* proxy_config,

std::string proxy_mode;

// We can safely assume that this is ASCII due to the allowed enumeration

- // values specified in extension_api.json.

+ // values specified in api/.

proxy_config->GetStringASCII(keys::kProxyConfigMode, &proxy_mode);

if (!ProxyPrefs::StringToProxyMode(proxy_mode, out)) {

LOG(ERROR) << "Invalid mode for proxy settings: " << proxy_mode;

@@ -154,7 +154,7 @@ bool GetProxyServer(const DictionaryValue* proxy_server,

std::string scheme_string; // optional.

// We can safely assume that this is ASCII due to the allowed enumeration

- // values specified in extension_api.json.

+ // values specified in api/.

proxy_server->GetStringASCII(keys::kProxyConfigRuleScheme, &scheme_string);

net::ProxyServer::Scheme scheme =