Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1367)

Unified Diff: chrome/browser/dom_ui/plugins_ui.cc

Issue 5621006: Merge PluginGroups for Adobe Reader (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address comments Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/plugin_exceptions_table_model.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 8c376021afbd49774adb517458dbd996ddd504dd..65bd2325613fbf18af3d3766f735bf675ec64325 100644
--- a/chrome/browser/dom_ui/plugins_ui.cc
+++ b/chrome/browser/dom_ui/plugins_ui.cc
@@ -223,14 +223,12 @@ void PluginsDOMHandler::HandleEnablePluginMessage(const ListValue* args) {
plugin_updater->EnablePluginGroup(enable, group_name);
if (enable) {
// See http://crbug.com/50105 for background.
- string16 reader8 = ASCIIToUTF16(PluginGroup::kAdobeReader8GroupName);
- string16 reader9 = ASCIIToUTF16(PluginGroup::kAdobeReader9GroupName);
+ string16 adobereader = ASCIIToUTF16(PluginGroup::kAdobeReaderGroupName);
string16 internalpdf = ASCIIToUTF16(PepperPluginRegistry::kPDFPluginName);
- if (group_name == reader8 || group_name == reader9) {
+ if (group_name == adobereader) {
plugin_updater->EnablePluginGroup(false, internalpdf);
} else if (group_name == internalpdf) {
- plugin_updater->EnablePluginGroup(false, reader8);
- plugin_updater->EnablePluginGroup(false, reader9);
+ plugin_updater->EnablePluginGroup(false, adobereader);
}
}
} else {
« no previous file with comments | « no previous file | chrome/browser/plugin_exceptions_table_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698