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

Unified Diff: android_webview/native/js_result_handler.cc

Issue 12082123: Rename JavaScriptDialogCreator to JavaScriptDialogManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 11 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
« no previous file with comments | « android_webview/native/js_result_handler.h ('k') | android_webview/native/webview_native.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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));
}
« no previous file with comments | « android_webview/native/js_result_handler.h ('k') | android_webview/native/webview_native.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698