diff options
author | dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-12 19:15:03 +0000 |
---|---|---|
committer | dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-12 19:15:03 +0000 |
commit | f3a1c64a4d81c412273ed567536f23c2c14813a2 (patch) | |
tree | f0ced21805b18546e879413e4f808dd4f683c534 /webkit | |
parent | 2338319a9acbaecba44243740b3f01b5c408a78a (diff) | |
download | chromium_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 'webkit')
-rw-r--r-- | webkit/plugins/npapi/plugin_group.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/webkit/plugins/npapi/plugin_group.h b/webkit/plugins/npapi/plugin_group.h index 063713a..7d5f67b 100644 --- a/webkit/plugins/npapi/plugin_group.h +++ b/webkit/plugins/npapi/plugin_group.h @@ -16,12 +16,15 @@ #include "base/string16.h" #include "webkit/plugins/npapi/webplugininfo.h" -class DictionaryValue; class FilePath; class TableModelArrayControllerTest; class PluginExceptionsTableModelTest; class Version; +namespace base { +class DictionaryValue; +} + namespace webkit { namespace npapi { @@ -165,10 +168,10 @@ class PluginGroup { const string16& description() const { return description_; } // Returns a DictionaryValue with data to display in the UI. - DictionaryValue* GetDataForUI() const; + base::DictionaryValue* GetDataForUI() const; // Returns a DictionaryValue with data to save in the preferences. - DictionaryValue* GetSummary() const; + base::DictionaryValue* GetSummary() const; // Returns the update URL. std::string GetUpdateURL() const { return update_url_; } |