summaryrefslogtreecommitdiffstats
path: root/chrome/browser/dom_ui/plugins_ui.cc
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-27 13:19:05 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-27 13:19:05 +0000
commitad2a3ded81c49ee89b44f6b544d21ff617c935bf (patch)
treee83f889f5b17ad81a5e177008df86a0ae9122e4d /chrome/browser/dom_ui/plugins_ui.cc
parentc0f2f52ebc9d7b41b79ea203a2cfae272c00b937 (diff)
downloadchromium_src-ad2a3ded81c49ee89b44f6b544d21ff617c935bf.zip
chromium_src-ad2a3ded81c49ee89b44f6b544d21ff617c935bf.tar.gz
chromium_src-ad2a3ded81c49ee89b44f6b544d21ff617c935bf.tar.bz2
Implement about:labs
Tabpose is currently the only lab on mac, tabs-on-left the only lab on windows. Nothing for linux yet. BUG=53399 TEST=Go to about:labs. Should have one feature on windows and osx each, none on linux yet. about:labs should not be visible on the stable channel. Labs that were enabled on the dev channel should not be enabled on the stable channel. about:labs in chromeos should still work (they use a different implementation) Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=57635 Review URL: http://codereview.chromium.org/3152055 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57670 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/dom_ui/plugins_ui.cc')
-rw-r--r--chrome/browser/dom_ui/plugins_ui.cc22
1 files changed, 3 insertions, 19 deletions
diff --git a/chrome/browser/dom_ui/plugins_ui.cc b/chrome/browser/dom_ui/plugins_ui.cc
index e529a68..a52fc88 100644
--- a/chrome/browser/dom_ui/plugins_ui.cc
+++ b/chrome/browser/dom_ui/plugins_ui.cc
@@ -5,7 +5,6 @@
#include "chrome/browser/dom_ui/plugins_ui.h"
#include <algorithm>
-#include <set>
#include <string>
#include <vector>
@@ -148,20 +147,6 @@ 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);
};
@@ -175,10 +160,9 @@ void PluginsDOMHandler::RegisterMessages() {
}
void PluginsDOMHandler::HandleRequestPluginsData(const ListValue* args) {
- DictionaryValue* results = new DictionaryValue();
- results->Set("plugins", plugin_updater::GetPluginGroupsData());
-
- dom_ui_->CallJavascriptFunction(L"returnPluginsData", *results);
+ DictionaryValue results;
+ results.Set("plugins", plugin_updater::GetPluginGroupsData());
+ dom_ui_->CallJavascriptFunction(L"returnPluginsData", results);
}
void PluginsDOMHandler::HandleEnablePluginMessage(const ListValue* args) {