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

Unified Diff: chrome_proxy_resolver.cc

Issue 5205002: AU: Manual proxy support (Closed) Base URL: http://git.chromium.org/git/update_engine.git@master
Patch Set: missed one fix for review Created 10 years, 1 month 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
« no previous file with comments | « chrome_proxy_resolver.h ('k') | chrome_proxy_resolver_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_proxy_resolver.cc
diff --git a/chrome_proxy_resolver.cc b/chrome_proxy_resolver.cc
index eaa213add0f93515eaefed628d6ef32a771c8e4d..66bc5dc4785ec35c99a670c047871f719a6c39c9 100644
--- a/chrome_proxy_resolver.cc
+++ b/chrome_proxy_resolver.cc
@@ -24,7 +24,7 @@ const char kSessionManagerProxySettingsKey[] = "cros.proxy.everywhere";
bool ChromeProxyResolver::GetProxiesForUrl(
const std::string& url,
- std::vector<std::string>* out_proxies) {
+ std::deque<std::string>* out_proxies) {
// First, query dbus for the currently stored settings
DBusGProxy* proxy = DbusProxy();
TEST_AND_RETURN_FALSE(proxy);
@@ -85,7 +85,7 @@ enum ProxyMode {
bool ChromeProxyResolver::GetProxiesForUrlWithSettings(
const string& url,
const string& json_settings,
- std::vector<std::string>* out_proxies) {
+ std::deque<std::string>* out_proxies) {
base::JSONReader parser;
scoped_ptr<Value> root(
« no previous file with comments | « chrome_proxy_resolver.h ('k') | chrome_proxy_resolver_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698