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

Unified Diff: chrome/browser/content_settings/content_settings_origin_identifier_value_map.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_origin_identifier_value_map.h
===================================================================
--- chrome/browser/content_settings/content_settings_origin_identifier_value_map.h (revision 92173)
+++ chrome/browser/content_settings/content_settings_origin_identifier_value_map.h (working copy)
@@ -15,7 +15,10 @@
#include "chrome/common/content_settings_types.h"
class GURL;
+
+namespace base {
class Value;
+}
namespace content_settings {
@@ -28,14 +31,14 @@
const ContentSettingsPattern& secondary_pattern,
ContentSettingsType content_type,
ResourceIdentifier identifier,
- Value* value);
+ base::Value* value);
~Entry();
ContentSettingsPattern primary_pattern;
ContentSettingsPattern secondary_pattern;
ContentSettingsType content_type;
ResourceIdentifier identifier;
- linked_ptr<Value> value;
+ linked_ptr<base::Value> value;
};
typedef std::list<Entry> EntryList;
@@ -70,7 +73,7 @@
// Returns a weak pointer to the value for the given |primary_pattern|,
// |secondary_pattern|, |content_type|, |resource_identifier| tuple. If
// no value is stored for the passed parameter |NULL| is returned.
- Value* GetValue(
+ base::Value* GetValue(
const GURL& primary_url,
const GURL& secondary_url,
ContentSettingsType content_type,
@@ -84,7 +87,7 @@
const ContentSettingsPattern& secondary_pattern,
ContentSettingsType content_type,
const ResourceIdentifier& resource_identifier,
- Value* value);
+ base::Value* value);
// Deletes the map entry for the given |primary_pattern|,
// |secondary_pattern|, |content_type|, |resource_identifier| tuple.

Powered by Google App Engine
This is Rietveld 408576698