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 /chrome/browser/plugin_updater.h | |
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 'chrome/browser/plugin_updater.h')
-rw-r--r-- | chrome/browser/plugin_updater.h | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/chrome/browser/plugin_updater.h b/chrome/browser/plugin_updater.h index 694c3b1..dc9cfaf 100644 --- a/chrome/browser/plugin_updater.h +++ b/chrome/browser/plugin_updater.h @@ -15,12 +15,15 @@ #include "chrome/browser/prefs/pref_change_registrar.h" #include "content/common/notification_observer.h" -class DictionaryValue; -class ListValue; class NotificationDetails; class NotificationSource; class Profile; +namespace base { +class DictionaryValue; +class ListValue; +} + namespace webkit { namespace npapi { class PluginGroup; @@ -32,7 +35,7 @@ class PluginUpdater : public NotificationObserver { public: // Get a list of all the plugin groups. The caller should take ownership // of the returned ListValue. - static ListValue* GetPluginGroupsData(); + static base::ListValue* GetPluginGroupsData(); // Enable or disable a plugin group. void EnablePluginGroup(bool enable, const string16& group_name); @@ -80,18 +83,19 @@ class PluginUpdater : public NotificationObserver { // Used for the post task to notify that plugin enabled status changed. static void OnNotifyPluginStatusChanged(); - static DictionaryValue* CreatePluginFileSummary( + static base::DictionaryValue* CreatePluginFileSummary( const webkit::npapi::WebPluginInfo& plugin); // Force plugins to be enabled or disabled due to policy. // |disabled_list| contains the list of StringValues of the names of the // policy-disabled plugins, |exceptions_list| the policy-allowed plugins, // and |enabled_list| the policy-enabled plugins. - void UpdatePluginsStateFromPolicy(const ListValue* disabled_list, - const ListValue* exceptions_list, - const ListValue* enabled_list); + void UpdatePluginsStateFromPolicy(const base::ListValue* disabled_list, + const base::ListValue* exceptions_list, + const base::ListValue* enabled_list); - void ListValueToStringSet(const ListValue* src, std::set<string16>* dest); + void ListValueToStringSet(const base::ListValue* src, + std::set<string16>* dest); // Needed to allow singleton instantiation using private constructor. friend struct DefaultSingletonTraits<PluginUpdater>; |