| Index: android_webview/native/js_result_handler.cc
|
| diff --git a/android_webview/native/js_result_handler.cc b/android_webview/native/js_result_handler.cc
|
| index 56d57dc8a7260a70b69183def9606190f8048b2f..974c741c776da0b82a8c6d359feb44289e140542 100644
|
| --- a/android_webview/native/js_result_handler.cc
|
| +++ b/android_webview/native/js_result_handler.cc
|
| @@ -5,9 +5,9 @@
|
| #include "android_webview/native/js_result_handler.h"
|
|
|
| #include "base/android/jni_string.h"
|
| -#include "jni/JsResultHandler_jni.h"
|
| -#include "content/public/browser/javascript_dialogs.h"
|
| #include "content/public/browser/android/content_view_core.h"
|
| +#include "content/public/browser/javascript_dialog_manager.h"
|
| +#include "jni/JsResultHandler_jni.h"
|
|
|
| using base::android::ConvertJavaStringToUTF16;
|
| using content::ContentViewCore;
|
| @@ -18,8 +18,8 @@ void ConfirmJsResult(JNIEnv* env,
|
| jobject obj,
|
| jint dialogPointer,
|
| jstring promptResult) {
|
| - content::JavaScriptDialogCreator::DialogClosedCallback* dialog_ =
|
| - reinterpret_cast<content::JavaScriptDialogCreator::DialogClosedCallback*>(
|
| + content::JavaScriptDialogManager::DialogClosedCallback* dialog_ =
|
| + reinterpret_cast<content::JavaScriptDialogManager::DialogClosedCallback*>(
|
| dialogPointer);
|
| string16 prompt_text;
|
| if (promptResult) {
|
| @@ -29,15 +29,15 @@ void ConfirmJsResult(JNIEnv* env,
|
| }
|
|
|
| void CancelJsResult(JNIEnv* env, jobject obj, jint dialogPointer) {
|
| - content::JavaScriptDialogCreator::DialogClosedCallback* dialog_ =
|
| - reinterpret_cast<content::JavaScriptDialogCreator::DialogClosedCallback*>(
|
| + content::JavaScriptDialogManager::DialogClosedCallback* dialog_ =
|
| + reinterpret_cast<content::JavaScriptDialogManager::DialogClosedCallback*>(
|
| dialogPointer);
|
| dialog_->Run(false, string16());
|
| }
|
|
|
| base::android::ScopedJavaLocalRef<jobject> createJsResultHandler(
|
| JNIEnv* env,
|
| - const content::JavaScriptDialogCreator::DialogClosedCallback* dialog) {
|
| + const content::JavaScriptDialogManager::DialogClosedCallback* dialog) {
|
| return Java_JsResultHandler_create(env, reinterpret_cast<jint>(dialog));
|
| }
|
|
|
|
|