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

Unified Diff: chrome/browser/pdf_unsupported_feature.cc

Issue 7618013: Revert 96409 - Speculatively revert r96364, it's the best bet on the NaCL breakage. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 months 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 | « chrome/browser/metrics/metrics_log.cc ('k') | chrome/browser/plugin_prefs.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/pdf_unsupported_feature.cc
===================================================================
--- chrome/browser/pdf_unsupported_feature.cc (revision 96410)
+++ chrome/browser/pdf_unsupported_feature.cc (working copy)
@@ -7,7 +7,7 @@
#include "base/utf_string_conversions.h"
#include "base/values.h"
#include "base/version.h"
-#include "chrome/browser/plugin_updater.h"
+#include "chrome/browser/plugin_prefs.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/tab_contents/chrome_interstitial_page.h"
@@ -114,12 +114,12 @@
UserMetrics::RecordAction(UserMetricsAction("PDF_EnableReaderInfoBarOK"));
webkit::npapi::PluginList::Singleton()->EnableGroup(false,
ASCIIToUTF16(chrome::ChromeContentClient::kPDFPluginName));
- PluginUpdater* plugin_updater = PluginUpdater::GetInstance();
- plugin_updater->EnablePluginGroup(true,
- ASCIIToUTF16(webkit::npapi::PluginGroup::kAdobeReaderGroupName));
Profile* profile =
Profile::FromBrowserContext(tab_contents_->browser_context());
- plugin_updater->UpdatePreferences(profile, 0);
+ PluginPrefs* plugin_prefs = PluginPrefs::GetForProfile(profile);
+ plugin_prefs->EnablePluginGroup(
+ true, ASCIIToUTF16(webkit::npapi::PluginGroup::kAdobeReaderGroupName));
+ plugin_prefs->UpdatePreferences(0);
}
void PDFEnableAdobeReaderInfoBarDelegate::OnNo() {
« no previous file with comments | « chrome/browser/metrics/metrics_log.cc ('k') | chrome/browser/plugin_prefs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698