diff options
| author | dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-12 19:15:03 +0000 |
|---|---|---|
| committer | dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-12 19:15:03 +0000 |
| commit | f3a1c64a4d81c412273ed567536f23c2c14813a2 (patch) | |
| tree | f0ced21805b18546e879413e4f808dd4f683c534 /net/proxy | |
| parent | 2338319a9acbaecba44243740b3f01b5c408a78a (diff) | |
| download | chromium_src-f3a1c64a4d81c412273ed567536f23c2c14813a2.zip chromium_src-f3a1c64a4d81c412273ed567536f23c2c14813a2.tar.gz chromium_src-f3a1c64a4d81c412273ed567536f23c2c14813a2.tar.bz2 | |
Move base/values.h into the base namespace. This includes a cros DEPS roll
with a minor change to that code since libcros also uses base/values.h.
BUG=88666
TEST=none
Review URL: http://codereview.chromium.org/7259019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92208 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy')
| -rw-r--r-- | net/proxy/proxy_config.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/proxy/proxy_config.h b/net/proxy/proxy_config.h index be5e2fb..fe3a1d17 100644 --- a/net/proxy/proxy_config.h +++ b/net/proxy/proxy_config.h @@ -13,7 +13,9 @@ #include "net/proxy/proxy_bypass_rules.h" #include "net/proxy/proxy_server.h" +namespace base { class Value; +} namespace net { @@ -131,7 +133,7 @@ class NET_API ProxyConfig { // Creates a Value dump of this configuration. The caller is responsible for // deleting the returned value. - Value* ToValue() const; + base::Value* ToValue() const; ProxyRules& proxy_rules() { return proxy_rules_; |