| 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..e6d8bf3874e3a6efe984a44d8b36b041eb429b67 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 {
|
| @@ -62,6 +67,8 @@ static std::string PermissionTypeToString(BrowserPluginPermissionType type) {
|
| return webview::kPermissionTypePointerLock;
|
| case BROWSER_PLUGIN_PERMISSION_TYPE_JAVASCRIPT_DIALOG:
|
| return webview::kPermissionTypeDialog;
|
| + case WEB_VIEW_PERMISSION_TYPE_LOAD_PLUGIN:
|
| + return webview::kPermissionTypeLoadPlugin;
|
| case BROWSER_PLUGIN_PERMISSION_TYPE_UNKNOWN:
|
| default:
|
| NOTREACHED();
|
| @@ -85,6 +92,9 @@ void RemoveWebViewEventListenersOnIOThread(
|
|
|
| void AttachWebViewHelpers(WebContents* contents) {
|
| FaviconTabHelper::CreateForWebContents(contents);
|
| +#if defined(ENABLE_PLUGINS)
|
| + PluginPermissionHelper::CreateForWebContents(contents);
|
| +#endif
|
| }
|
|
|
| } // namespace
|
| @@ -116,6 +126,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) {
|
|
|