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

Unified Diff: chrome/browser/guest_view/web_view/javascript_dialog_helper.cc

Issue 347113002: Refactor PluginPermissionHelper as WebViewPermissionHelper (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 5 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/guest_view/web_view/javascript_dialog_helper.cc
diff --git a/chrome/browser/guest_view/web_view/javascript_dialog_helper.cc b/chrome/browser/guest_view/web_view/javascript_dialog_helper.cc
index a52219576c1ff834aa9d4e5aef33ef3f3733c71c..c2fe9a4c0fc0967532e5a4c7e58185648eefc757 100644
--- a/chrome/browser/guest_view/web_view/javascript_dialog_helper.cc
+++ b/chrome/browser/guest_view/web_view/javascript_dialog_helper.cc
@@ -9,6 +9,7 @@
#include "chrome/browser/guest_view/guest_view_constants.h"
#include "chrome/browser/guest_view/web_view/web_view_constants.h"
#include "chrome/browser/guest_view/web_view/web_view_guest.h"
+#include "chrome/browser/guest_view/web_view/web_view_permission_helper.h"
#include "chrome/browser/guest_view/web_view/web_view_permission_types.h"
namespace {
@@ -31,7 +32,7 @@ std::string JavaScriptMessageTypeToString(
} // namespace
JavaScriptDialogHelper::JavaScriptDialogHelper(WebViewGuest* guest)
- : webview_guest_(guest) {
+ : web_view_guest_(guest) {
}
JavaScriptDialogHelper::~JavaScriptDialogHelper() {
@@ -56,7 +57,9 @@ void JavaScriptDialogHelper::RunJavaScriptDialog(
new base::StringValue(
JavaScriptMessageTypeToString(javascript_message_type)));
request_info.Set(guestview::kUrl, new base::StringValue(origin_url.spec()));
- webview_guest_->RequestPermission(
+ WebViewPermissionHelper* web_view_permission_helper =
+ WebViewPermissionHelper::FromWebContents(web_contents);
+ web_view_permission_helper->RequestPermission(
WEB_VIEW_PERMISSION_TYPE_JAVASCRIPT_DIALOG,
request_info,
base::Bind(&JavaScriptDialogHelper::OnPermissionResponse,
@@ -94,6 +97,6 @@ void JavaScriptDialogHelper::OnPermissionResponse(
const DialogClosedCallback& callback,
bool allow,
const std::string& user_input) {
- callback.Run(allow && webview_guest_->attached(),
+ callback.Run(allow && web_view_guest_->attached(),
base::UTF8ToUTF16(user_input));
}

Powered by Google App Engine
This is Rietveld 408576698