| Index: android_webview/native/aw_web_contents_delegate.cc
|
| diff --git a/android_webview/native/aw_web_contents_delegate.cc b/android_webview/native/aw_web_contents_delegate.cc
|
| index 27847c4668eb3c899dccc2f0f9b338a3cb1b7937..e08a65f6702caf8a5d28939038ce311b81f136a9 100644
|
| --- a/android_webview/native/aw_web_contents_delegate.cc
|
| +++ b/android_webview/native/aw_web_contents_delegate.cc
|
| @@ -6,7 +6,7 @@
|
|
|
| #include "android_webview/browser/find_helper.h"
|
| #include "android_webview/native/aw_contents.h"
|
| -#include "android_webview/native/aw_javascript_dialog_creator.h"
|
| +#include "android_webview/native/aw_javascript_dialog_manager.h"
|
| #include "base/android/scoped_java_ref.h"
|
| #include "base/lazy_instance.h"
|
| #include "base/message_loop.h"
|
| @@ -19,8 +19,8 @@ using content::WebContents;
|
|
|
| namespace android_webview {
|
|
|
| -static base::LazyInstance<AwJavaScriptDialogCreator>::Leaky
|
| - g_javascript_dialog_creator = LAZY_INSTANCE_INITIALIZER;
|
| +static base::LazyInstance<AwJavaScriptDialogManager>::Leaky
|
| + g_javascript_dialog_manager = LAZY_INSTANCE_INITIALIZER;
|
|
|
| AwWebContentsDelegate::AwWebContentsDelegate(
|
| JNIEnv* env,
|
| @@ -31,9 +31,9 @@ AwWebContentsDelegate::AwWebContentsDelegate(
|
| AwWebContentsDelegate::~AwWebContentsDelegate() {
|
| }
|
|
|
| -content::JavaScriptDialogCreator*
|
| -AwWebContentsDelegate::GetJavaScriptDialogCreator() {
|
| - return g_javascript_dialog_creator.Pointer();
|
| +content::JavaScriptDialogManager*
|
| +AwWebContentsDelegate::GetJavaScriptDialogManager() {
|
| + return g_javascript_dialog_manager.Pointer();
|
| }
|
|
|
| void AwWebContentsDelegate::FindReply(WebContents* web_contents,
|
|
|