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

Unified Diff: chrome/browser/guestview/webview/webview_guest.cc

Issue 24576003: <webview>: Change how plugin load works inside guests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 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/guestview/webview/webview_guest.cc
diff --git a/chrome/browser/guestview/webview/webview_guest.cc b/chrome/browser/guestview/webview/webview_guest.cc
index 2c8e825a915ed4c79c1fc845200f4d8d121818c1..d891d73391ba0dc6482e7fc5283674591ee55022 100644
--- a/chrome/browser/guestview/webview/webview_guest.cc
+++ b/chrome/browser/guestview/webview/webview_guest.cc
@@ -11,6 +11,7 @@
#include "chrome/browser/favicon/favicon_tab_helper.h"
#include "chrome/browser/guestview/guestview_constants.h"
#include "chrome/browser/guestview/webview/webview_constants.h"
+#include "chrome/browser/guestview/webview/webview_permission_types.h"
#include "chrome/common/chrome_version_info.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/native_web_keyboard_event.h"
@@ -26,6 +27,10 @@
#include "content/public/common/result_codes.h"
#include "net/base/net_errors.h"
+#if defined(ENABLE_PLUGINS)
+#include "chrome/browser/guestview/webview/plugin_permission_helper.h"
+#endif
+
using content::WebContents;
namespace {
@@ -63,9 +68,16 @@ static std::string PermissionTypeToString(BrowserPluginPermissionType type) {
case BROWSER_PLUGIN_PERMISSION_TYPE_JAVASCRIPT_DIALOG:
return webview::kPermissionTypeDialog;
case BROWSER_PLUGIN_PERMISSION_TYPE_UNKNOWN:
- default:
NOTREACHED();
break;
+ default: {
+ WebViewPermissionType webview = static_cast<WebViewPermissionType>(type);
+ switch (webview) {
+ case WEB_VIEW_PERMISSION_TYPE_LOAD_PLUGIN:
+ return webview::kPermissionTypeLoadPlugin;
+ }
+ NOTREACHED();
+ }
}
return std::string();
}
@@ -85,6 +97,9 @@ void RemoveWebViewEventListenersOnIOThread(
void AttachWebViewHelpers(WebContents* contents) {
FaviconTabHelper::CreateForWebContents(contents);
+#if defined(ENABLE_PLUGINS)
+ PluginPermissionHelper::CreateForWebContents(contents);
+#endif
}
} // namespace
@@ -116,6 +131,12 @@ WebViewGuest* WebViewGuest::From(int embedder_process_id,
return guest->AsWebView();
}
+// static
+WebViewGuest* WebViewGuest::FromWebContents(WebContents* contents) {
+ GuestView* guest = GuestView::FromWebContents(contents);
+ return guest ? guest->AsWebView() : NULL;
+}
+
void WebViewGuest::Attach(WebContents* embedder_web_contents,
const std::string& extension_id,
const base::DictionaryValue& args) {
« no previous file with comments | « chrome/browser/guestview/webview/webview_guest.h ('k') | chrome/browser/guestview/webview/webview_permission_types.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698