summaryrefslogtreecommitdiffstats
path: root/chrome/browser/background/background_contents_service.h
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/background/background_contents_service.h
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/background/background_contents_service.h')
-rw-r--r--chrome/browser/background/background_contents_service.h12
1 files changed, 8 insertions, 4 deletions
diff --git a/chrome/browser/background/background_contents_service.h b/chrome/browser/background/background_contents_service.h
index 32e677a..88787f6 100644
--- a/chrome/browser/background/background_contents_service.h
+++ b/chrome/browser/background/background_contents_service.h
@@ -21,12 +21,15 @@
#include "webkit/glue/window_open_disposition.h"
class CommandLine;
-class DictionaryValue;
class NotificationDelegate;
class PrefService;
class Profile;
class TabContents;
+namespace base {
+class DictionaryValue;
+}
+
namespace gfx {
class Rect;
}
@@ -114,9 +117,10 @@ class BackgroundContentsService : private NotificationObserver,
// Load a BackgroundContent; the settings are read from the provided
// dictionary.
- void LoadBackgroundContentsFromDictionary(Profile* profile,
- const std::string& extension_id,
- const DictionaryValue* contents);
+ void LoadBackgroundContentsFromDictionary(
+ Profile* profile,
+ const std::string& extension_id,
+ const base::DictionaryValue* contents);
// Load the manifest-specified BackgroundContents for all apps for the
// profile.