summaryrefslogtreecommitdiffstats
path: root/chrome/browser/geolocation
diff options
context:
space:
mode:
authordmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-12 19:15:03 +0000
committerdmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-12 19:15:03 +0000
commitf3a1c64a4d81c412273ed567536f23c2c14813a2 (patch)
treef0ced21805b18546e879413e4f808dd4f683c534 /chrome/browser/geolocation
parent2338319a9acbaecba44243740b3f01b5c408a78a (diff)
downloadchromium_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 'chrome/browser/geolocation')
-rw-r--r--chrome/browser/geolocation/geolocation_content_settings_map.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/geolocation/geolocation_content_settings_map.h b/chrome/browser/geolocation/geolocation_content_settings_map.h
index 0aa1309..640ae96 100644
--- a/chrome/browser/geolocation/geolocation_content_settings_map.h
+++ b/chrome/browser/geolocation/geolocation_content_settings_map.h
@@ -24,10 +24,13 @@
#include "googleurl/src/gurl.h"
class ContentSettingsDetails;
-class DictionaryValue;
class PrefService;
class Profile;
+namespace base {
+class DictionaryValue;
+}
+
class GeolocationContentSettingsMap
: public base::RefCountedThreadSafe<GeolocationContentSettingsMap>,
public NotificationObserver {
@@ -109,7 +112,7 @@ class GeolocationContentSettingsMap
// Sets the fields of |one_origin_settings| based on the values in
// |dictionary|.
static void GetOneOriginSettingsFromDictionary(
- const DictionaryValue* dictionary,
+ const base::DictionaryValue* dictionary,
OneOriginSettings* one_origin_settings);
// The profile we're associated with.