OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/ui/android/javascript_app_modal_dialog_android.h" | 5 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h" |
6 | 6 |
7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
8 #include "base/android/jni_string.h" | 8 #include "base/android/jni_string.h" |
9 #include "base/macros.h" | 9 #include "base/macros.h" |
10 #include "base/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
11 #include "chrome/browser/ui/javascript_dialogs/chrome_javascript_native_dialog_f
actory.h" | 11 #include "chrome/browser/ui/javascript_dialogs/chrome_javascript_native_dialog_f
actory.h" |
12 #include "components/app_modal/app_modal_dialog_queue.h" | 12 #include "components/app_modal/app_modal_dialog_queue.h" |
13 #include "components/app_modal/javascript_app_modal_dialog.h" | 13 #include "components/app_modal/javascript_app_modal_dialog.h" |
14 #include "components/app_modal/javascript_dialog_manager.h" | 14 #include "components/app_modal/javascript_dialog_manager.h" |
15 #include "components/app_modal/javascript_native_dialog_factory.h" | 15 #include "components/app_modal/javascript_native_dialog_factory.h" |
16 #include "content/public/browser/browser_thread.h" | 16 #include "content/public/browser/browser_thread.h" |
17 #include "content/public/browser/web_contents.h" | 17 #include "content/public/browser/web_contents.h" |
18 #include "content/public/browser/web_contents_delegate.h" | 18 #include "content/public/browser/web_contents_delegate.h" |
19 #include "content/public/common/javascript_message_type.h" | 19 #include "content/public/common/javascript_message_type.h" |
20 #include "jni/JavascriptAppModalDialog_jni.h" | 20 #include "jni/JavascriptAppModalDialog_jni.h" |
21 #include "ui/android/window_android.h" | 21 #include "ui/android/window_android.h" |
22 | 22 |
23 using base::android::AttachCurrentThread; | 23 using base::android::AttachCurrentThread; |
24 using base::android::ConvertUTF16ToJavaString; | 24 using base::android::ConvertUTF16ToJavaString; |
| 25 using base::android::JavaParamRef; |
25 using base::android::ScopedJavaGlobalRef; | 26 using base::android::ScopedJavaGlobalRef; |
26 using base::android::ScopedJavaLocalRef; | 27 using base::android::ScopedJavaLocalRef; |
27 | 28 |
28 JavascriptAppModalDialogAndroid::JavascriptAppModalDialogAndroid( | 29 JavascriptAppModalDialogAndroid::JavascriptAppModalDialogAndroid( |
29 JNIEnv* env, | 30 JNIEnv* env, |
30 app_modal::JavaScriptAppModalDialog* dialog, | 31 app_modal::JavaScriptAppModalDialog* dialog, |
31 gfx::NativeWindow parent) | 32 gfx::NativeWindow parent) |
32 : dialog_(dialog), | 33 : dialog_(dialog), |
33 parent_jobject_weak_ref_(env, parent->GetJavaObject().obj()) { | 34 parent_jobject_weak_ref_(env, parent->GetJavaObject().obj()) { |
34 } | 35 } |
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
193 DISALLOW_COPY_AND_ASSIGN(ChromeJavaScriptNativeDialogAndroidFactory); | 194 DISALLOW_COPY_AND_ASSIGN(ChromeJavaScriptNativeDialogAndroidFactory); |
194 }; | 195 }; |
195 | 196 |
196 } // namespace | 197 } // namespace |
197 | 198 |
198 void InstallChromeJavaScriptNativeDialogFactory() { | 199 void InstallChromeJavaScriptNativeDialogFactory() { |
199 app_modal::JavaScriptDialogManager::GetInstance()->SetNativeDialogFactory( | 200 app_modal::JavaScriptDialogManager::GetInstance()->SetNativeDialogFactory( |
200 base::WrapUnique(new ChromeJavaScriptNativeDialogAndroidFactory)); | 201 base::WrapUnique(new ChromeJavaScriptNativeDialogAndroidFactory)); |
201 } | 202 } |
202 | 203 |
OLD | NEW |