| 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 "extensions/browser/guest_view/web_view/javascript_dialog_helper.h" | 5 #include "extensions/browser/guest_view/web_view/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 "components/guest_view/common/guest_view_constants.h" |
| 9 #include "extensions/browser/guest_view/web_view/web_view_constants.h" | 10 #include "extensions/browser/guest_view/web_view/web_view_constants.h" |
| 10 #include "extensions/browser/guest_view/web_view/web_view_guest.h" | 11 #include "extensions/browser/guest_view/web_view/web_view_guest.h" |
| 11 #include "extensions/browser/guest_view/web_view/web_view_permission_helper.h" | 12 #include "extensions/browser/guest_view/web_view/web_view_permission_helper.h" |
| 12 #include "extensions/browser/guest_view/web_view/web_view_permission_types.h" | 13 #include "extensions/browser/guest_view/web_view/web_view_permission_types.h" |
| 13 #include "extensions/common/guest_view/guest_view_constants.h" | |
| 14 | 14 |
| 15 namespace extensions { | 15 namespace extensions { |
| 16 | 16 |
| 17 namespace { | 17 namespace { |
| 18 | 18 |
| 19 std::string JavaScriptMessageTypeToString( | 19 std::string JavaScriptMessageTypeToString( |
| 20 content::JavaScriptMessageType message_type) { | 20 content::JavaScriptMessageType message_type) { |
| 21 switch (message_type) { | 21 switch (message_type) { |
| 22 case content::JAVASCRIPT_MESSAGE_TYPE_ALERT: | 22 case content::JAVASCRIPT_MESSAGE_TYPE_ALERT: |
| 23 return "alert"; | 23 return "alert"; |
| (...skipping 27 matching lines...) Expand all Loading... |
| 51 bool* did_suppress_message) { | 51 bool* did_suppress_message) { |
| 52 base::DictionaryValue request_info; | 52 base::DictionaryValue request_info; |
| 53 request_info.Set( | 53 request_info.Set( |
| 54 webview::kDefaultPromptText, | 54 webview::kDefaultPromptText, |
| 55 new base::StringValue(base::UTF16ToUTF8(default_prompt_text))); | 55 new base::StringValue(base::UTF16ToUTF8(default_prompt_text))); |
| 56 request_info.Set(webview::kMessageText, | 56 request_info.Set(webview::kMessageText, |
| 57 new base::StringValue(base::UTF16ToUTF8(message_text))); | 57 new base::StringValue(base::UTF16ToUTF8(message_text))); |
| 58 request_info.Set(webview::kMessageType, | 58 request_info.Set(webview::kMessageType, |
| 59 new base::StringValue( | 59 new base::StringValue( |
| 60 JavaScriptMessageTypeToString(javascript_message_type))); | 60 JavaScriptMessageTypeToString(javascript_message_type))); |
| 61 request_info.Set(guestview::kUrl, new base::StringValue(origin_url.spec())); | 61 request_info.Set(guest_view::kUrl, new base::StringValue(origin_url.spec())); |
| 62 WebViewPermissionHelper* web_view_permission_helper = | 62 WebViewPermissionHelper* web_view_permission_helper = |
| 63 WebViewPermissionHelper::FromWebContents(web_contents); | 63 WebViewPermissionHelper::FromWebContents(web_contents); |
| 64 web_view_permission_helper->RequestPermission( | 64 web_view_permission_helper->RequestPermission( |
| 65 WEB_VIEW_PERMISSION_TYPE_JAVASCRIPT_DIALOG, | 65 WEB_VIEW_PERMISSION_TYPE_JAVASCRIPT_DIALOG, |
| 66 request_info, | 66 request_info, |
| 67 base::Bind(&JavaScriptDialogHelper::OnPermissionResponse, | 67 base::Bind(&JavaScriptDialogHelper::OnPermissionResponse, |
| 68 base::Unretained(this), | 68 base::Unretained(this), |
| 69 callback), | 69 callback), |
| 70 false /* allowed_by_default */); | 70 false /* allowed_by_default */); |
| 71 } | 71 } |
| (...skipping 25 matching lines...) Expand all Loading... |
| 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 && web_view_guest_->attached(), | 102 callback.Run(allow && web_view_guest_->attached(), |
| 103 base::UTF8ToUTF16(user_input)); | 103 base::UTF8ToUTF16(user_input)); |
| 104 } | 104 } |
| 105 | 105 |
| 106 } // namespace extensions | 106 } // namespace extensions |
| OLD | NEW |