chrome/browser/guestview/webview/javascript_dialog_helper.cc - Issue 257823005: [Sheriff] Revert "Revert "Revert 266297 "1. Handle the case of empty embedder_extension_id..."""

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/guestview/webview/javascript_dialog_helper.cc

Issue 257823005: [Sheriff] Revert "Revert "Revert 266297 "1. Handle the case of empty embedder_extension_id...""" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 7 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/guestview/webview/javascript_dialog_helper.h ('k') | chrome/browser/guestview/webview/plugin_permission_helper.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/guest_view/web_view/javascript_dialog_helper.h"	5 #include "chrome/browser/guestview/webview/javascript_dialog_helper.h"

6	6

7 #include "base/strings/utf_string_conversions.h"	7 #include "base/strings/utf_string_conversions.h"

8 #include "base/values.h"	8 #include "base/values.h"

9 #include "chrome/browser/guest_view/guest_view_constants.h"	9 #include "chrome/browser/guestview/guestview_constants.h"

10 #include "chrome/browser/guest_view/web_view/web_view_constants.h"	10 #include "chrome/browser/guestview/webview/webview_constants.h"

11 #include "chrome/browser/guest_view/web_view/web_view_guest.h"	11 #include "chrome/browser/guestview/webview/webview_guest.h"

12 #include "chrome/browser/guest_view/web_view/web_view_permission_types.h"	12 #include "chrome/browser/guestview/webview/webview_permission_types.h"

13	13

14 namespace {	14 namespace {

15	15

16 std::string JavaScriptMessageTypeToString(	16 std::string JavaScriptMessageTypeToString(

17 content::JavaScriptMessageType message_type) {	17 content::JavaScriptMessageType message_type) {

18 switch (message_type) {	18 switch (message_type) {

19 case content::JAVASCRIPT_MESSAGE_TYPE_ALERT:	19 case content::JAVASCRIPT_MESSAGE_TYPE_ALERT:

20 return "alert";	20 return "alert";

21 case content::JAVASCRIPT_MESSAGE_TYPE_CONFIRM:	21 case content::JAVASCRIPT_MESSAGE_TYPE_CONFIRM:

22 return "confirm";	22 return "confirm";

(...skipping 72 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
95 content::WebContents* web_contents) {	95 content::WebContents* web_contents) {

96 }	96 }

97	97

98 void JavaScriptDialogHelper::OnPermissionResponse(	98 void JavaScriptDialogHelper::OnPermissionResponse(

99 const DialogClosedCallback& callback,	99 const DialogClosedCallback& callback,

100 bool allow,	100 bool allow,

101 const std::string& user_input) {	101 const std::string& user_input) {

102 callback.Run(allow && webview_guest_->attached(),	102 callback.Run(allow && webview_guest_->attached(),

103 base::UTF8ToUTF16(user_input));	103 base::UTF8ToUTF16(user_input));

104 }	104 }

OLD	NEW