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

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

Issue 2537083002: Make dismiss works for PermissionPromptAndroid (Closed)
Patch Set: remove dependency and land this first 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 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/grouped_permission_infobar_delegate_android .h" 5 #include "chrome/browser/permissions/grouped_permission_infobar_delegate_android .h"
6 6
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "chrome/browser/android/android_theme_resources.h" 8 #include "chrome/browser/android/android_theme_resources.h"
9 #include "chrome/browser/infobars/infobar_service.h" 9 #include "chrome/browser/infobars/infobar_service.h"
10 #include "chrome/browser/permissions/permission_prompt_android.h" 10 #include "chrome/browser/permissions/permission_prompt_android.h"
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 permission_prompt_->Accept(); 71 permission_prompt_->Accept();
72 return true; 72 return true;
73 } 73 }
74 74
75 bool GroupedPermissionInfoBarDelegate::Cancel() { 75 bool GroupedPermissionInfoBarDelegate::Cancel() {
76 if (permission_prompt_) 76 if (permission_prompt_)
77 permission_prompt_->Deny(); 77 permission_prompt_->Deny();
78 return true; 78 return true;
79 } 79 }
80 80
81 void GroupedPermissionInfoBarDelegate::InfoBarDismissed() {
82 if (permission_prompt_)
83 permission_prompt_->Closing();
84 }
85
81 void GroupedPermissionInfoBarDelegate::PermissionPromptDestroyed() { 86 void GroupedPermissionInfoBarDelegate::PermissionPromptDestroyed() {
82 permission_prompt_ = nullptr; 87 permission_prompt_ = nullptr;
83 } 88 }
84 89
85 GroupedPermissionInfoBarDelegate::GroupedPermissionInfoBarDelegate( 90 GroupedPermissionInfoBarDelegate::GroupedPermissionInfoBarDelegate(
86 PermissionPromptAndroid* permission_prompt, 91 PermissionPromptAndroid* permission_prompt,
87 const GURL& requesting_origin, 92 const GURL& requesting_origin,
88 const std::vector<PermissionRequest*>& requests) 93 const std::vector<PermissionRequest*>& requests)
89 : requesting_origin_(requesting_origin), 94 : requesting_origin_(requesting_origin),
90 requests_(requests), 95 requests_(requests),
(...skipping 23 matching lines...) Expand all
114 base::string16 GroupedPermissionInfoBarDelegate::GetButtonLabel( 119 base::string16 GroupedPermissionInfoBarDelegate::GetButtonLabel(
115 InfoBarButton button) const { 120 InfoBarButton button) const {
116 if (permission_count() > 1) { 121 if (permission_count() > 1) {
117 return l10n_util::GetStringUTF16((button == BUTTON_OK) ? IDS_APP_OK 122 return l10n_util::GetStringUTF16((button == BUTTON_OK) ? IDS_APP_OK
118 : IDS_APP_CANCEL); 123 : IDS_APP_CANCEL);
119 } 124 }
120 125
121 return l10n_util::GetStringUTF16((button == BUTTON_OK) ? IDS_PERMISSION_ALLOW 126 return l10n_util::GetStringUTF16((button == BUTTON_OK) ? IDS_PERMISSION_ALLOW
122 : IDS_PERMISSION_DENY); 127 : IDS_PERMISSION_DENY);
123 } 128 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698