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

Unified Diff: chrome/browser/plugins/plugin_info_message_filter.cc

Issue 1312653003: Fix for WebView accessible resources. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Small fix. Rebased. Created 5 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/plugins/plugin_info_message_filter.cc
diff --git a/chrome/browser/plugins/plugin_info_message_filter.cc b/chrome/browser/plugins/plugin_info_message_filter.cc
index 62589126713525f30698b657487470c657d42c07..46f6f50764f1f528d624fa7d012a6069e430153f 100644
--- a/chrome/browser/plugins/plugin_info_message_filter.cc
+++ b/chrome/browser/plugins/plugin_info_message_filter.cc
@@ -39,7 +39,6 @@
#include "extensions/browser/guest_view/web_view/web_view_renderer_state.h"
#include "extensions/common/constants.h"
#include "extensions/common/extension.h"
-#include "extensions/common/manifest_constants.h"
#include "extensions/common/manifest_handlers/webview_info.h"
#endif
@@ -169,17 +168,10 @@ bool IsPluginLoadingAccessibleResourceInWebView(
}
const std::string extension_id = resource.host();
- const extensions::Extension* extension =
- extension_registry->GetExtensionById(extension_id,
- extensions::ExtensionRegistry::ENABLED);
- if (!extension)
- return false;
- const extensions::WebviewInfo* webview_info =
- static_cast<const extensions::WebviewInfo*>(extension->GetManifestData(
- extensions::manifest_keys::kWebviewAccessibleResources));
- if (!webview_info ||
- !webview_info->IsResourceWebviewAccessible(extension, partition_id,
- resource.path())) {
+ const extensions::Extension* extension = extension_registry->GetExtensionById(
+ extension_id, extensions::ExtensionRegistry::ENABLED);
+ if (!extension || !extensions::WebviewInfo::IsResourceWebviewAccessible(
+ extension, partition_id, resource.path())) {
return false;
}

Powered by Google App Engine
This is Rietveld 408576698