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

Side by Side Diff: chrome/browser/permissions/permission_dialog_delegate.cc

Issue 2897223002: Fix message text for modal prompts when PermissionRequestManager enabled (Closed)
Patch Set: address comments Created 3 years, 6 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/permissions/permission_dialog_delegate.h" 5 #include "chrome/browser/permissions/permission_dialog_delegate.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/android/jni_android.h" 9 #include "base/android/jni_android.h"
10 #include "base/android/jni_array.h" 10 #include "base/android/jni_array.h"
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 DCHECK_EQ(1u, permission_prompt_->PermissionCount()); 152 DCHECK_EQ(1u, permission_prompt_->PermissionCount());
153 153
154 std::vector<int> content_settings_types{ 154 std::vector<int> content_settings_types{
155 permission_prompt_->GetContentSettingType(0)}; 155 permission_prompt_->GetContentSettingType(0)};
156 156
157 j_delegate_.Reset(Java_PermissionDialogDelegate_create( 157 j_delegate_.Reset(Java_PermissionDialogDelegate_create(
158 env, reinterpret_cast<uintptr_t>(this), tab_->GetJavaObject(), 158 env, reinterpret_cast<uintptr_t>(this), tab_->GetJavaObject(),
159 base::android::ToJavaIntArray(env, content_settings_types).obj(), 159 base::android::ToJavaIntArray(env, content_settings_types).obj(),
160 ResourceMapper::MapFromChromiumId( 160 ResourceMapper::MapFromChromiumId(
161 permission_prompt_->GetIconIdForPermission(0)), 161 permission_prompt_->GetIconIdForPermission(0)),
162 // TODO(timloh): This is the wrong string. 162 ConvertUTF16ToJavaString(env, permission_prompt_->GetMessageText(0)),
163 ConvertUTF16ToJavaString(env,
164 permission_prompt_->GetMessageTextFragment(0)),
165 // TODO(timloh): Pass the actual link text for EME. 163 // TODO(timloh): Pass the actual link text for EME.
166 ConvertUTF16ToJavaString(env, base::string16()), primaryButtonText, 164 ConvertUTF16ToJavaString(env, base::string16()), primaryButtonText,
167 secondaryButtonText, 165 secondaryButtonText,
168 // TODO(timloh): Hook up the persistence toggle. 166 // TODO(timloh): Hook up the persistence toggle.
169 false)); 167 false));
170 } 168 }
171 169
172 void PermissionDialogDelegate::Accept(JNIEnv* env, 170 void PermissionDialogDelegate::Accept(JNIEnv* env,
173 const JavaParamRef<jobject>& obj, 171 const JavaParamRef<jobject>& obj,
174 jboolean persist) { 172 jboolean persist) {
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 navigation_handle->IsSameDocument()) { 262 navigation_handle->IsSameDocument()) {
265 return; 263 return;
266 } 264 }
267 265
268 DismissDialog(); 266 DismissDialog();
269 } 267 }
270 268
271 void PermissionDialogDelegate::WebContentsDestroyed() { 269 void PermissionDialogDelegate::WebContentsDestroyed() {
272 DismissDialog(); 270 DismissDialog();
273 } 271 }
OLDNEW
« no previous file with comments | « chrome/browser/media/webrtc/media_stream_devices_controller.cc ('k') | chrome/browser/permissions/permission_prompt_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698