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

Side by Side Diff: chrome/browser/ui/android/website_settings_popup_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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/website_settings_popup_android.h" 5 #include "chrome/browser/ui/android/website_settings_popup_android.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_array.h" 8 #include "base/android/jni_array.h"
9 #include "base/android/jni_string.h" 9 #include "base/android/jni_string.h"
10 #include "base/stl_util.h" 10 #include "base/stl_util.h"
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 JNIEnv* env, 76 JNIEnv* env,
77 const JavaParamRef<jobject>& obj, 77 const JavaParamRef<jobject>& obj,
78 jint action) { 78 jint action) {
79 presenter_->RecordWebsiteSettingsAction( 79 presenter_->RecordWebsiteSettingsAction(
80 static_cast<WebsiteSettings::WebsiteSettingsAction>(action)); 80 static_cast<WebsiteSettings::WebsiteSettingsAction>(action));
81 } 81 }
82 82
83 void WebsiteSettingsPopupAndroid::SetIdentityInfo( 83 void WebsiteSettingsPopupAndroid::SetIdentityInfo(
84 const IdentityInfo& identity_info) { 84 const IdentityInfo& identity_info) {
85 JNIEnv* env = base::android::AttachCurrentThread(); 85 JNIEnv* env = base::android::AttachCurrentThread();
86 Java_WebsiteSettingsPopup_showDialog(env, popup_jobject_.obj()); 86 Java_WebsiteSettingsPopup_showDialog(env, popup_jobject_);
87 } 87 }
88 88
89 void WebsiteSettingsPopupAndroid::SetCookieInfo( 89 void WebsiteSettingsPopupAndroid::SetCookieInfo(
90 const CookieInfoList& cookie_info_list) { 90 const CookieInfoList& cookie_info_list) {
91 NOTIMPLEMENTED(); 91 NOTIMPLEMENTED();
92 } 92 }
93 93
94 void WebsiteSettingsPopupAndroid::SetPermissionInfo( 94 void WebsiteSettingsPopupAndroid::SetPermissionInfo(
95 const PermissionInfoList& permission_info_list, 95 const PermissionInfoList& permission_info_list,
96 const ChosenObjectInfoList& chosen_object_info_list) { 96 const ChosenObjectInfoList& chosen_object_info_list) {
(...skipping 20 matching lines...) Expand all
117 user_specified_settings_to_display[permission.type] = permission.setting; 117 user_specified_settings_to_display[permission.type] = permission.setting;
118 } 118 }
119 } 119 }
120 120
121 for (const auto& permission : permissions_to_display) { 121 for (const auto& permission : permissions_to_display) {
122 if (base::ContainsKey(user_specified_settings_to_display, permission)) { 122 if (base::ContainsKey(user_specified_settings_to_display, permission)) {
123 base::string16 setting_title = 123 base::string16 setting_title =
124 WebsiteSettingsUI::PermissionTypeToUIString(permission); 124 WebsiteSettingsUI::PermissionTypeToUIString(permission);
125 125
126 Java_WebsiteSettingsPopup_addPermissionSection( 126 Java_WebsiteSettingsPopup_addPermissionSection(
127 env, 127 env, popup_jobject_, ConvertUTF16ToJavaString(env, setting_title),
128 popup_jobject_.obj(),
129 ConvertUTF16ToJavaString(env, setting_title).obj(),
130 static_cast<jint>(permission), 128 static_cast<jint>(permission),
131 static_cast<jint>(user_specified_settings_to_display[permission])); 129 static_cast<jint>(user_specified_settings_to_display[permission]));
132 } 130 }
133 } 131 }
134 132
135 for (auto* chosen_object : chosen_object_info_list) { 133 for (auto* chosen_object : chosen_object_info_list) {
136 base::string16 object_title = 134 base::string16 object_title =
137 WebsiteSettingsUI::ChosenObjectToUIString(*chosen_object); 135 WebsiteSettingsUI::ChosenObjectToUIString(*chosen_object);
138 136
139 Java_WebsiteSettingsPopup_addPermissionSection( 137 Java_WebsiteSettingsPopup_addPermissionSection(
140 env, popup_jobject_.obj(), 138 env, popup_jobject_, ConvertUTF16ToJavaString(env, object_title),
141 ConvertUTF16ToJavaString(env, object_title).obj(),
142 static_cast<jint>(chosen_object->ui_info.content_settings_type), 139 static_cast<jint>(chosen_object->ui_info.content_settings_type),
143 static_cast<jint>(CONTENT_SETTING_ALLOW)); 140 static_cast<jint>(CONTENT_SETTING_ALLOW));
144 delete chosen_object; 141 delete chosen_object;
145 } 142 }
146 143
147 Java_WebsiteSettingsPopup_updatePermissionDisplay(env, popup_jobject_.obj()); 144 Java_WebsiteSettingsPopup_updatePermissionDisplay(env, popup_jobject_);
148 } 145 }
149 146
150 void WebsiteSettingsPopupAndroid::SetSelectedTab( 147 void WebsiteSettingsPopupAndroid::SetSelectedTab(
151 WebsiteSettingsUI::TabId tab_id) { 148 WebsiteSettingsUI::TabId tab_id) {
152 // There's no tab UI on Android - only connection info is shown. 149 // There's no tab UI on Android - only connection info is shown.
153 NOTIMPLEMENTED(); 150 NOTIMPLEMENTED();
154 } 151 }
155 152
156 // static 153 // static
157 bool WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid( 154 bool WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid(
158 JNIEnv* env) { 155 JNIEnv* env) {
159 return RegisterNativesImpl(env); 156 return RegisterNativesImpl(env);
160 } 157 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/android/usb_chooser_dialog_android.cc ('k') | components/cronet/android/chromium_url_request.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698