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

Unified Diff: chrome/browser/content_settings/content_settings_pref_provider.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
Index: chrome/browser/content_settings/content_settings_pref_provider.h
===================================================================
--- chrome/browser/content_settings/content_settings_pref_provider.h (revision 92173)
+++ chrome/browser/content_settings/content_settings_pref_provider.h (working copy)
@@ -22,10 +22,13 @@
#include "content/common/notification_registrar.h"
class ContentSettingsDetails;
-class DictionaryValue;
class HostContentSettingsMap;
class PrefService;
+namespace base {
+class DictionaryValue;
+}
+
namespace content_settings {
// Content settings provider that provides default content settings based on
@@ -62,7 +65,7 @@
void NotifyObservers(const ContentSettingsDetails& details);
// Sets the fields of |settings| based on the values in |dictionary|.
- void GetSettingsFromDictionary(const DictionaryValue* dictionary,
+ void GetSettingsFromDictionary(const base::DictionaryValue* dictionary,
ContentSettings* settings);
// Forces the default settings to be explicitly set instead of themselves
@@ -187,7 +190,7 @@
void SyncObsoletePref();
static void CanonicalizeContentSettingsExceptions(
- DictionaryValue* all_settings_dictionary);
+ base::DictionaryValue* all_settings_dictionary);
void NotifyObservers(const ContentSettingsDetails& details);

Powered by Google App Engine
This is Rietveld 408576698