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

Side by Side Diff: chrome/browser/ui/android/page_info/website_settings_popup_android.cc

Issue 2521173004: Remove SetSelectedTab() and deprecate unused WebsiteSettingsAction values. (Closed)
Patch Set: Created 4 years 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/page_info/website_settings_popup_android.h" 5 #include "chrome/browser/ui/android/page_info/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 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 142
143 Java_WebsiteSettingsPopup_addPermissionSection( 143 Java_WebsiteSettingsPopup_addPermissionSection(
144 env, popup_jobject_, ConvertUTF16ToJavaString(env, object_title), 144 env, popup_jobject_, ConvertUTF16ToJavaString(env, object_title),
145 static_cast<jint>(chosen_object->ui_info.content_settings_type), 145 static_cast<jint>(chosen_object->ui_info.content_settings_type),
146 static_cast<jint>(CONTENT_SETTING_ALLOW)); 146 static_cast<jint>(CONTENT_SETTING_ALLOW));
147 } 147 }
148 148
149 Java_WebsiteSettingsPopup_updatePermissionDisplay(env, popup_jobject_); 149 Java_WebsiteSettingsPopup_updatePermissionDisplay(env, popup_jobject_);
150 } 150 }
151 151
152 void WebsiteSettingsPopupAndroid::SetSelectedTab(
153 WebsiteSettingsUI::TabId tab_id) {
154 // There's no tab UI on Android - only connection info is shown.
155 NOTIMPLEMENTED();
156 }
157
158 // static 152 // static
159 bool WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid( 153 bool WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid(
160 JNIEnv* env) { 154 JNIEnv* env) {
161 return RegisterNativesImpl(env); 155 return RegisterNativesImpl(env);
162 } 156 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698