| Index: chrome/browser/dom_ui/plugins_ui.cc
|
| diff --git a/chrome/browser/dom_ui/plugins_ui.cc b/chrome/browser/dom_ui/plugins_ui.cc
|
| index a52fc88205c4a0b65de937bab904b90cbe24d2f3..e529a680c1a6f845da6f9f07344dbb9f200cf095 100644
|
| --- a/chrome/browser/dom_ui/plugins_ui.cc
|
| +++ b/chrome/browser/dom_ui/plugins_ui.cc
|
| @@ -5,6 +5,7 @@
|
| #include "chrome/browser/dom_ui/plugins_ui.h"
|
|
|
| #include <algorithm>
|
| +#include <set>
|
| #include <string>
|
| #include <vector>
|
|
|
| @@ -147,6 +148,20 @@ class PluginsDOMHandler : public DOMMessageHandler {
|
| void HandleShowTermsOfServiceMessage(const ListValue* args);
|
|
|
| private:
|
| + // Creates a dictionary containing all the information about the given plugin;
|
| + // this is put into the list to "return" for the "requestPluginsData" message.
|
| + DictionaryValue* CreatePluginDetailValue(
|
| + const WebPluginInfo& plugin,
|
| + const std::set<string16>& plugin_blacklist_set);
|
| +
|
| + // Creates a dictionary containing the important parts of the information
|
| + // about the given plugin; this is put into a list and saved in prefs.
|
| + DictionaryValue* CreatePluginSummaryValue(const WebPluginInfo& plugin);
|
| +
|
| + // Update the user preferences to reflect the current (user-selected) state of
|
| + // plugins.
|
| + void UpdatePreferences();
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(PluginsDOMHandler);
|
| };
|
|
|
| @@ -160,9 +175,10 @@ void PluginsDOMHandler::RegisterMessages() {
|
| }
|
|
|
| void PluginsDOMHandler::HandleRequestPluginsData(const ListValue* args) {
|
| - DictionaryValue results;
|
| - results.Set("plugins", plugin_updater::GetPluginGroupsData());
|
| - dom_ui_->CallJavascriptFunction(L"returnPluginsData", results);
|
| + DictionaryValue* results = new DictionaryValue();
|
| + results->Set("plugins", plugin_updater::GetPluginGroupsData());
|
| +
|
| + dom_ui_->CallJavascriptFunction(L"returnPluginsData", *results);
|
| }
|
|
|
| void PluginsDOMHandler::HandleEnablePluginMessage(const ListValue* args) {
|
|
|