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 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
129 dialog_->OnCancel(should_suppress_js_dialogs); | 129 dialog_->OnCancel(should_suppress_js_dialogs); |
130 delete this; | 130 delete this; |
131 } | 131 } |
132 | 132 |
133 const ScopedJavaGlobalRef<jobject>& | 133 const ScopedJavaGlobalRef<jobject>& |
134 JavascriptAppModalDialogAndroid::GetDialogObject() const { | 134 JavascriptAppModalDialogAndroid::GetDialogObject() const { |
135 return dialog_jobject_; | 135 return dialog_jobject_; |
136 } | 136 } |
137 | 137 |
138 // static | 138 // static |
139 jobject GetCurrentModalDialog(JNIEnv* env, jclass clazz) { | 139 ScopedJavaLocalRef<jobject> GetCurrentModalDialog(JNIEnv* env, jclass clazz) { |
140 app_modal::AppModalDialog* dialog = | 140 app_modal::AppModalDialog* dialog = |
141 app_modal::AppModalDialogQueue::GetInstance()->active_dialog(); | 141 app_modal::AppModalDialogQueue::GetInstance()->active_dialog(); |
142 if (!dialog || !dialog->native_dialog()) | 142 if (!dialog || !dialog->native_dialog()) |
143 return NULL; | 143 return ScopedJavaLocalRef<jobject>(); |
144 | 144 |
145 JavascriptAppModalDialogAndroid* js_dialog = | 145 JavascriptAppModalDialogAndroid* js_dialog = |
146 static_cast<JavascriptAppModalDialogAndroid*>(dialog->native_dialog()); | 146 static_cast<JavascriptAppModalDialogAndroid*>(dialog->native_dialog()); |
147 return js_dialog->GetDialogObject().obj(); | 147 return ScopedJavaLocalRef<jobject>(js_dialog->GetDialogObject()); |
148 } | 148 } |
149 | 149 |
150 // static | 150 // static |
151 bool JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog( | 151 bool JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog( |
152 JNIEnv* env) { | 152 JNIEnv* env) { |
153 return RegisterNativesImpl(env); | 153 return RegisterNativesImpl(env); |
154 } | 154 } |
155 | 155 |
156 JavascriptAppModalDialogAndroid::~JavascriptAppModalDialogAndroid() { | 156 JavascriptAppModalDialogAndroid::~JavascriptAppModalDialogAndroid() { |
157 // In case the dialog is still displaying, tell it to close itself. | 157 // In case the dialog is still displaying, tell it to close itself. |
(...skipping 27 matching lines...) Expand all Loading... |
185 }; | 185 }; |
186 | 186 |
187 } // namespace | 187 } // namespace |
188 | 188 |
189 void InstallChromeJavaScriptNativeDialogFactory() { | 189 void InstallChromeJavaScriptNativeDialogFactory() { |
190 app_modal::JavaScriptDialogManager::GetInstance()-> | 190 app_modal::JavaScriptDialogManager::GetInstance()-> |
191 SetNativeDialogFactory( | 191 SetNativeDialogFactory( |
192 make_scoped_ptr(new ChromeJavaScriptNativeDialogAndroidFactory)); | 192 make_scoped_ptr(new ChromeJavaScriptNativeDialogAndroidFactory)); |
193 } | 193 } |
194 | 194 |
OLD | NEW |