Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(59)

Side by Side Diff: chrome/browser/ui/android/javascript_app_modal_dialog_android.cc

Issue 2901583002: Fold AppModalDialog into its only subclass, JavaScriptAppModalDialog. (Closed)
Patch Set: fix collapse Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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"
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 145
146 const ScopedJavaGlobalRef<jobject>& 146 const ScopedJavaGlobalRef<jobject>&
147 JavascriptAppModalDialogAndroid::GetDialogObject() const { 147 JavascriptAppModalDialogAndroid::GetDialogObject() const {
148 return dialog_jobject_; 148 return dialog_jobject_;
149 } 149 }
150 150
151 // static 151 // static
152 ScopedJavaLocalRef<jobject> GetCurrentModalDialog( 152 ScopedJavaLocalRef<jobject> GetCurrentModalDialog(
153 JNIEnv* env, 153 JNIEnv* env,
154 const JavaParamRef<jclass>& clazz) { 154 const JavaParamRef<jclass>& clazz) {
155 app_modal::AppModalDialog* dialog = 155 app_modal::JavaScriptAppModalDialog* dialog =
156 app_modal::AppModalDialogQueue::GetInstance()->active_dialog(); 156 app_modal::AppModalDialogQueue::GetInstance()->active_dialog();
157 if (!dialog || !dialog->native_dialog()) 157 if (!dialog || !dialog->native_dialog())
158 return ScopedJavaLocalRef<jobject>(); 158 return ScopedJavaLocalRef<jobject>();
159 159
160 JavascriptAppModalDialogAndroid* js_dialog = 160 JavascriptAppModalDialogAndroid* js_dialog =
161 static_cast<JavascriptAppModalDialogAndroid*>(dialog->native_dialog()); 161 static_cast<JavascriptAppModalDialogAndroid*>(dialog->native_dialog());
162 return ScopedJavaLocalRef<jobject>(js_dialog->GetDialogObject()); 162 return ScopedJavaLocalRef<jobject>(js_dialog->GetDialogObject());
163 } 163 }
164 164
165 // static 165 // static
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 DISALLOW_COPY_AND_ASSIGN(ChromeJavaScriptNativeDialogAndroidFactory); 199 DISALLOW_COPY_AND_ASSIGN(ChromeJavaScriptNativeDialogAndroidFactory);
200 }; 200 };
201 201
202 } // namespace 202 } // namespace
203 203
204 void InstallChromeJavaScriptNativeDialogFactory() { 204 void InstallChromeJavaScriptNativeDialogFactory() {
205 app_modal::JavaScriptDialogManager::GetInstance()->SetNativeDialogFactory( 205 app_modal::JavaScriptDialogManager::GetInstance()->SetNativeDialogFactory(
206 base::WrapUnique(new ChromeJavaScriptNativeDialogAndroidFactory)); 206 base::WrapUnique(new ChromeJavaScriptNativeDialogAndroidFactory));
207 } 207 }
208 208
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698