| 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/chrome_javascript_native_dialog_factory.h" | 9 #include "chrome/browser/ui/app_modal/chrome_javascript_native_dialog_factory.h" |
| 10 #include "components/app_modal/app_modal_dialog_queue.h" | 10 #include "components/app_modal/app_modal_dialog_queue.h" |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 CancelAppModalDialog(); | 101 CancelAppModalDialog(); |
| 102 } | 102 } |
| 103 | 103 |
| 104 void JavascriptAppModalDialogAndroid::AcceptAppModalDialog() { | 104 void JavascriptAppModalDialogAndroid::AcceptAppModalDialog() { |
| 105 base::string16 prompt_text; | 105 base::string16 prompt_text; |
| 106 dialog_->OnAccept(prompt_text, false); | 106 dialog_->OnAccept(prompt_text, false); |
| 107 delete this; | 107 delete this; |
| 108 } | 108 } |
| 109 | 109 |
| 110 void JavascriptAppModalDialogAndroid::DidAcceptAppModalDialog( | 110 void JavascriptAppModalDialogAndroid::DidAcceptAppModalDialog( |
| 111 JNIEnv* env, jobject, jstring prompt, bool should_suppress_js_dialogs) { | 111 JNIEnv* env, |
| 112 const JavaParamRef<jobject>&, |
| 113 const JavaParamRef<jstring>& prompt, |
| 114 bool should_suppress_js_dialogs) { |
| 112 base::string16 prompt_text = | 115 base::string16 prompt_text = |
| 113 base::android::ConvertJavaStringToUTF16(env, prompt); | 116 base::android::ConvertJavaStringToUTF16(env, prompt); |
| 114 dialog_->OnAccept(prompt_text, should_suppress_js_dialogs); | 117 dialog_->OnAccept(prompt_text, should_suppress_js_dialogs); |
| 115 delete this; | 118 delete this; |
| 116 } | 119 } |
| 117 | 120 |
| 118 void JavascriptAppModalDialogAndroid::CancelAppModalDialog() { | 121 void JavascriptAppModalDialogAndroid::CancelAppModalDialog() { |
| 119 dialog_->OnCancel(false); | 122 dialog_->OnCancel(false); |
| 120 delete this; | 123 delete this; |
| 121 } | 124 } |
| 122 | 125 |
| 123 bool JavascriptAppModalDialogAndroid::IsShowing() const { | 126 bool JavascriptAppModalDialogAndroid::IsShowing() const { |
| 124 return true; | 127 return true; |
| 125 } | 128 } |
| 126 | 129 |
| 127 void JavascriptAppModalDialogAndroid::DidCancelAppModalDialog( | 130 void JavascriptAppModalDialogAndroid::DidCancelAppModalDialog( |
| 128 JNIEnv* env, jobject, bool should_suppress_js_dialogs) { | 131 JNIEnv* env, |
| 132 const JavaParamRef<jobject>&, |
| 133 bool should_suppress_js_dialogs) { |
| 129 dialog_->OnCancel(should_suppress_js_dialogs); | 134 dialog_->OnCancel(should_suppress_js_dialogs); |
| 130 delete this; | 135 delete this; |
| 131 } | 136 } |
| 132 | 137 |
| 133 const ScopedJavaGlobalRef<jobject>& | 138 const ScopedJavaGlobalRef<jobject>& |
| 134 JavascriptAppModalDialogAndroid::GetDialogObject() const { | 139 JavascriptAppModalDialogAndroid::GetDialogObject() const { |
| 135 return dialog_jobject_; | 140 return dialog_jobject_; |
| 136 } | 141 } |
| 137 | 142 |
| 138 // static | 143 // static |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 187 }; | 192 }; |
| 188 | 193 |
| 189 } // namespace | 194 } // namespace |
| 190 | 195 |
| 191 void InstallChromeJavaScriptNativeDialogFactory() { | 196 void InstallChromeJavaScriptNativeDialogFactory() { |
| 192 app_modal::JavaScriptDialogManager::GetInstance()-> | 197 app_modal::JavaScriptDialogManager::GetInstance()-> |
| 193 SetNativeDialogFactory( | 198 SetNativeDialogFactory( |
| 194 make_scoped_ptr(new ChromeJavaScriptNativeDialogAndroidFactory)); | 199 make_scoped_ptr(new ChromeJavaScriptNativeDialogAndroidFactory)); |
| 195 } | 200 } |
| 196 | 201 |
| OLD | NEW |