| 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 "chrome/browser/ui/app_modal_dialogs/chrome_javascript_native_dialog_fa
ctory.h" | 9 #include "chrome/browser/ui/app_modal/chrome_javascript_native_dialog_factory.h" |
| 10 #include "components/app_modal_dialogs/app_modal_dialog_queue.h" | 10 #include "components/app_modal/app_modal_dialog_queue.h" |
| 11 #include "components/app_modal_dialogs/javascript_app_modal_dialog.h" | 11 #include "components/app_modal/javascript_app_modal_dialog.h" |
| 12 #include "components/app_modal_dialogs/javascript_dialog_manager.h" | 12 #include "components/app_modal/javascript_dialog_manager.h" |
| 13 #include "components/app_modal_dialogs/javascript_native_dialog_factory.h" | 13 #include "components/app_modal/javascript_native_dialog_factory.h" |
| 14 #include "content/public/browser/browser_thread.h" | 14 #include "content/public/browser/browser_thread.h" |
| 15 #include "content/public/common/javascript_message_type.h" | 15 #include "content/public/common/javascript_message_type.h" |
| 16 #include "jni/JavascriptAppModalDialog_jni.h" | 16 #include "jni/JavascriptAppModalDialog_jni.h" |
| 17 #include "ui/base/android/window_android.h" | 17 #include "ui/base/android/window_android.h" |
| 18 | 18 |
| 19 using base::android::AttachCurrentThread; | 19 using base::android::AttachCurrentThread; |
| 20 using base::android::ConvertUTF16ToJavaString; | 20 using base::android::ConvertUTF16ToJavaString; |
| 21 using base::android::ScopedJavaGlobalRef; | 21 using base::android::ScopedJavaGlobalRef; |
| 22 using base::android::ScopedJavaLocalRef; | 22 using base::android::ScopedJavaLocalRef; |
| 23 | 23 |
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 176 DISALLOW_COPY_AND_ASSIGN(ChromeJavaScriptNativeDialogAndroidFactory); | 176 DISALLOW_COPY_AND_ASSIGN(ChromeJavaScriptNativeDialogAndroidFactory); |
| 177 }; | 177 }; |
| 178 | 178 |
| 179 } // namespace | 179 } // namespace |
| 180 | 180 |
| 181 void InstallChromeJavaScriptNativeDialogFactory() { | 181 void InstallChromeJavaScriptNativeDialogFactory() { |
| 182 SetJavaScriptNativeDialogFactory( | 182 SetJavaScriptNativeDialogFactory( |
| 183 make_scoped_ptr(new ChromeJavaScriptNativeDialogAndroidFactory)); | 183 make_scoped_ptr(new ChromeJavaScriptNativeDialogAndroidFactory)); |
| 184 } | 184 } |
| 185 | 185 |
| OLD | NEW |