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

Unified Diff: chrome/browser/ui/pdf/pdf_unsupported_feature.cc

Issue 10918174: Remove PluginGroup (Closed) Base URL: http://git.chromium.org/chromium/src.git@remove_async_plugin_finder
Patch Set: bauerb@ +1 Created 8 years, 3 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
Index: chrome/browser/ui/pdf/pdf_unsupported_feature.cc
diff --git a/chrome/browser/ui/pdf/pdf_unsupported_feature.cc b/chrome/browser/ui/pdf/pdf_unsupported_feature.cc
index fa8b3acd9bef8bb6f8d4b226a31d3167d84510c3..1d371462828cf9e9c60663054dc9ccabbe40e728 100644
--- a/chrome/browser/ui/pdf/pdf_unsupported_feature.cc
+++ b/chrome/browser/ui/pdf/pdf_unsupported_feature.cc
@@ -39,7 +39,6 @@
#include "ui/base/layout.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/image/image.h"
-#include "webkit/plugins/npapi/plugin_group.h"
#if defined(OS_WIN)
#include "base/win/metro.h"
@@ -51,7 +50,6 @@ using content::PluginService;
using content::Referrer;
using content::UserMetricsAction;
using content::WebContents;
-using webkit::npapi::PluginGroup;
using webkit::WebPluginInfo;
namespace {
@@ -132,7 +130,7 @@ void PDFEnableAdobeReaderInfoBarDelegate::OnYes() {
content::RecordAction(UserMetricsAction("PDF_EnableReaderInfoBarOK"));
PluginPrefs* plugin_prefs = PluginPrefs::GetForProfile(profile_);
plugin_prefs->EnablePluginGroup(
- true, ASCIIToUTF16(webkit::npapi::PluginGroup::kAdobeReaderGroupName));
+ true, ASCIIToUTF16(PluginMetadata::kAdobeReaderGroupName));
plugin_prefs->EnablePluginGroup(
false, ASCIIToUTF16(chrome::ChromeContentClient::kPDFPluginName));
}
@@ -157,7 +155,7 @@ void OpenUsingReader(TabContents* tab,
tab->web_contents()->GetRenderProcessHost()->GetID(),
tab->web_contents()->GetRenderViewHost()->GetRoutingID(),
tab->web_contents()->GetURL(),
- ASCIIToUTF16(PluginGroup::kAdobeReaderGroupName));
+ ASCIIToUTF16(PluginMetadata::kAdobeReaderGroupName));
tab->web_contents()->GetRenderViewHost()->ReloadFrame();
if (delegate)
@@ -374,7 +372,8 @@ void GotPluginsCallback(int process_id,
if (!tab)
return;
- string16 reader_group_name(ASCIIToUTF16(PluginGroup::kAdobeReaderGroupName));
+ string16 reader_group_name(
+ ASCIIToUTF16(PluginMetadata::kAdobeReaderGroupName));
// If the Reader plugin is disabled by policy, don't prompt them.
PluginPrefs* plugin_prefs = PluginPrefs::GetForProfile(tab->profile());
if (plugin_prefs->PolicyStatusForPlugin(reader_group_name) ==

Powered by Google App Engine
This is Rietveld 408576698