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

Unified Diff: chrome/browser/content_settings/content_settings_internal_extension_provider.cc

Issue 956163002: Correctly whitelist the PDF plugin in the PDF extension. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2311
Patch Set: Created 5 years, 10 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 | « no previous file | chrome/browser/pdf/pdf_extension_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/content_settings/content_settings_internal_extension_provider.cc
diff --git a/chrome/browser/content_settings/content_settings_internal_extension_provider.cc b/chrome/browser/content_settings/content_settings_internal_extension_provider.cc
index a9f93583774a7389384ec952c7d4b3e29d6db4e2..d6be8d60695284b0b71d47d4364088595c1340c9 100644
--- a/chrome/browser/content_settings/content_settings_internal_extension_provider.cc
+++ b/chrome/browser/content_settings/content_settings_internal_extension_provider.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/content_settings/content_settings_internal_extension_provider.h"
+#include "chrome/browser/pdf/pdf_extension_util.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/chrome_content_client.h"
#include "chrome/common/extensions/api/plugins/plugins_handler.h"
@@ -191,7 +192,7 @@ void InternalExtensionProvider::ApplyPluginContentSettingsForExtension(
// The PDF viewer extension relies on the out of process PDF plugin.
if (extension->id() == extension_misc::kPdfExtensionId) {
SetContentSettingForExtensionAndResource(
- extension, ChromeContentClient::kPDFPluginPath, setting);
+ extension, pdf_extension_util::kPdfResourceIdentifier, setting);
}
}
« no previous file with comments | « no previous file | chrome/browser/pdf/pdf_extension_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698