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

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

Issue 2237943002: Remove now-unnecessary .obj() in Java method calls. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@switch-context
Patch Set: Rebase *again* :( Created 4 years, 4 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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 } 52 }
53 53
54 ScopedJavaLocalRef<jobject> dialog_object; 54 ScopedJavaLocalRef<jobject> dialog_object;
55 ScopedJavaLocalRef<jstring> title = 55 ScopedJavaLocalRef<jstring> title =
56 ConvertUTF16ToJavaString(env, dialog_->title()); 56 ConvertUTF16ToJavaString(env, dialog_->title());
57 ScopedJavaLocalRef<jstring> message = 57 ScopedJavaLocalRef<jstring> message =
58 ConvertUTF16ToJavaString(env, dialog_->message_text()); 58 ConvertUTF16ToJavaString(env, dialog_->message_text());
59 59
60 switch (dialog_->javascript_message_type()) { 60 switch (dialog_->javascript_message_type()) {
61 case content::JAVASCRIPT_MESSAGE_TYPE_ALERT: { 61 case content::JAVASCRIPT_MESSAGE_TYPE_ALERT: {
62 dialog_object = Java_JavascriptAppModalDialog_createAlertDialog(env, 62 dialog_object = Java_JavascriptAppModalDialog_createAlertDialog(
63 title.obj(), message.obj(), 63 env, title, message, dialog_->display_suppress_checkbox());
64 dialog_->display_suppress_checkbox());
65 break; 64 break;
66 } 65 }
67 case content::JAVASCRIPT_MESSAGE_TYPE_CONFIRM: { 66 case content::JAVASCRIPT_MESSAGE_TYPE_CONFIRM: {
68 if (dialog_->is_before_unload_dialog()) { 67 if (dialog_->is_before_unload_dialog()) {
69 dialog_object = Java_JavascriptAppModalDialog_createBeforeUnloadDialog( 68 dialog_object = Java_JavascriptAppModalDialog_createBeforeUnloadDialog(
70 env, title.obj(), message.obj(), dialog_->is_reload(), 69 env, title, message, dialog_->is_reload(),
71 dialog_->display_suppress_checkbox()); 70 dialog_->display_suppress_checkbox());
72 } else { 71 } else {
73 dialog_object = Java_JavascriptAppModalDialog_createConfirmDialog(env, 72 dialog_object = Java_JavascriptAppModalDialog_createConfirmDialog(
74 title.obj(), message.obj(), 73 env, title, message, dialog_->display_suppress_checkbox());
75 dialog_->display_suppress_checkbox());
76 } 74 }
77 break; 75 break;
78 } 76 }
79 case content::JAVASCRIPT_MESSAGE_TYPE_PROMPT: { 77 case content::JAVASCRIPT_MESSAGE_TYPE_PROMPT: {
80 ScopedJavaLocalRef<jstring> default_prompt_text = 78 ScopedJavaLocalRef<jstring> default_prompt_text =
81 ConvertUTF16ToJavaString(env, dialog_->default_prompt_text()); 79 ConvertUTF16ToJavaString(env, dialog_->default_prompt_text());
82 dialog_object = Java_JavascriptAppModalDialog_createPromptDialog(env, 80 dialog_object = Java_JavascriptAppModalDialog_createPromptDialog(
83 title.obj(), message.obj(), 81 env, title, message, dialog_->display_suppress_checkbox(),
84 dialog_->display_suppress_checkbox(), default_prompt_text.obj()); 82 default_prompt_text);
85 break; 83 break;
86 } 84 }
87 default: 85 default:
88 NOTREACHED(); 86 NOTREACHED();
89 } 87 }
90 88
91 // Keep a ref to the java side object until we get a confirm or cancel. 89 // Keep a ref to the java side object until we get a confirm or cancel.
92 dialog_jobject_.Reset(dialog_object); 90 dialog_jobject_.Reset(dialog_object);
93 91
94 Java_JavascriptAppModalDialog_showJavascriptAppModalDialog(env, 92 Java_JavascriptAppModalDialog_showJavascriptAppModalDialog(
95 dialog_object.obj(), parent_jobj.obj(), 93 env, dialog_object, parent_jobj, reinterpret_cast<intptr_t>(this));
96 reinterpret_cast<intptr_t>(this));
97 } 94 }
98 95
99 void JavascriptAppModalDialogAndroid::ActivateAppModalDialog() { 96 void JavascriptAppModalDialogAndroid::ActivateAppModalDialog() {
100 ShowAppModalDialog(); 97 ShowAppModalDialog();
101 } 98 }
102 99
103 void JavascriptAppModalDialogAndroid::CloseAppModalDialog() { 100 void JavascriptAppModalDialogAndroid::CloseAppModalDialog() {
104 CancelAppModalDialog(); 101 CancelAppModalDialog();
105 } 102 }
106 103
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 JNIEnv* env) { 159 JNIEnv* env) {
163 return RegisterNativesImpl(env); 160 return RegisterNativesImpl(env);
164 } 161 }
165 162
166 JavascriptAppModalDialogAndroid::~JavascriptAppModalDialogAndroid() { 163 JavascriptAppModalDialogAndroid::~JavascriptAppModalDialogAndroid() {
167 // In case the dialog is still displaying, tell it to close itself. 164 // In case the dialog is still displaying, tell it to close itself.
168 // This can happen if you trigger a dialog but close the Tab before it's 165 // This can happen if you trigger a dialog but close the Tab before it's
169 // shown, and then accept the dialog. 166 // shown, and then accept the dialog.
170 if (!dialog_jobject_.is_null()) { 167 if (!dialog_jobject_.is_null()) {
171 JNIEnv* env = AttachCurrentThread(); 168 JNIEnv* env = AttachCurrentThread();
172 Java_JavascriptAppModalDialog_dismiss(env, dialog_jobject_.obj()); 169 Java_JavascriptAppModalDialog_dismiss(env, dialog_jobject_);
173 } 170 }
174 } 171 }
175 172
176 namespace { 173 namespace {
177 174
178 class ChromeJavaScriptNativeDialogAndroidFactory 175 class ChromeJavaScriptNativeDialogAndroidFactory
179 : public app_modal::JavaScriptNativeDialogFactory { 176 : public app_modal::JavaScriptNativeDialogFactory {
180 public: 177 public:
181 ChromeJavaScriptNativeDialogAndroidFactory() {} 178 ChromeJavaScriptNativeDialogAndroidFactory() {}
182 ~ChromeJavaScriptNativeDialogAndroidFactory() override {} 179 ~ChromeJavaScriptNativeDialogAndroidFactory() override {}
(...skipping 11 matching lines...) Expand all
194 DISALLOW_COPY_AND_ASSIGN(ChromeJavaScriptNativeDialogAndroidFactory); 191 DISALLOW_COPY_AND_ASSIGN(ChromeJavaScriptNativeDialogAndroidFactory);
195 }; 192 };
196 193
197 } // namespace 194 } // namespace
198 195
199 void InstallChromeJavaScriptNativeDialogFactory() { 196 void InstallChromeJavaScriptNativeDialogFactory() {
200 app_modal::JavaScriptDialogManager::GetInstance()->SetNativeDialogFactory( 197 app_modal::JavaScriptDialogManager::GetInstance()->SetNativeDialogFactory(
201 base::WrapUnique(new ChromeJavaScriptNativeDialogAndroidFactory)); 198 base::WrapUnique(new ChromeJavaScriptNativeDialogAndroidFactory));
202 } 199 }
203 200
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698