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

Unified Diff: chrome/browser/prefs/proxy_config_dictionary.h

Issue 7259019: Move base/values.h into the base namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 5 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
« no previous file with comments | « chrome/browser/prefs/pref_value_map.h ('k') | chrome/browser/prefs/scoped_user_pref_update.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prefs/proxy_config_dictionary.h
===================================================================
--- chrome/browser/prefs/proxy_config_dictionary.h (revision 92173)
+++ chrome/browser/prefs/proxy_config_dictionary.h (working copy)
@@ -12,7 +12,9 @@
#include "base/memory/scoped_ptr.h"
#include "chrome/browser/prefs/proxy_prefs.h"
+namespace base {
class DictionaryValue;
+}
// Factory and wrapper for proxy config dictionaries that are stored
// in the user preferences. The dictionary has the following structure:
@@ -26,7 +28,7 @@
class ProxyConfigDictionary {
public:
// Creates a deep copy of |dict| and leaves ownership to caller.
- explicit ProxyConfigDictionary(const DictionaryValue* dict);
+ explicit ProxyConfigDictionary(const base::DictionaryValue* dict);
~ProxyConfigDictionary();
bool GetMode(ProxyPrefs::ProxyMode* out) const;
@@ -36,22 +38,23 @@
bool GetBypassList(std::string* out) const;
bool HasBypassList() const;
- static DictionaryValue* CreateDirect();
- static DictionaryValue* CreateAutoDetect();
- static DictionaryValue* CreatePacScript(const std::string& pac_url,
+ static base::DictionaryValue* CreateDirect();
+ static base::DictionaryValue* CreateAutoDetect();
+ static base::DictionaryValue* CreatePacScript(const std::string& pac_url,
bool pac_mandatory);
- static DictionaryValue* CreateFixedServers(
+ static base::DictionaryValue* CreateFixedServers(
const std::string& proxy_server,
const std::string& bypass_list);
- static DictionaryValue* CreateSystem();
+ static base::DictionaryValue* CreateSystem();
private:
- static DictionaryValue* CreateDictionary(ProxyPrefs::ProxyMode mode,
- const std::string& pac_url,
- bool pac_mandatory,
- const std::string& proxy_server,
- const std::string& bypass_list);
+ static base::DictionaryValue* CreateDictionary(
+ ProxyPrefs::ProxyMode mode,
+ const std::string& pac_url,
+ bool pac_mandatory,
+ const std::string& proxy_server,
+ const std::string& bypass_list);
- scoped_ptr<DictionaryValue> dict_;
+ scoped_ptr<base::DictionaryValue> dict_;
DISALLOW_COPY_AND_ASSIGN(ProxyConfigDictionary);
};
« no previous file with comments | « chrome/browser/prefs/pref_value_map.h ('k') | chrome/browser/prefs/scoped_user_pref_update.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698