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

Side by Side Diff: chrome/browser/ui/permission_bubble/mock_permission_prompt.cc

Issue 2829023002: Fix cancelling permission requests on Android when the PermissionRequestManager is enabled (Closed)
Patch Set: rebase Created 3 years, 7 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/permission_bubble/mock_permission_prompt.h" 5 #include "chrome/browser/ui/permission_bubble/mock_permission_prompt.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/run_loop.h" 8 #include "base/run_loop.h"
9 #include "chrome/browser/permissions/permission_request_manager.h" 9 #include "chrome/browser/permissions/permission_request_manager.h"
10 #include "chrome/browser/ui/permission_bubble/mock_permission_prompt_factory.h" 10 #include "chrome/browser/ui/permission_bubble/mock_permission_prompt_factory.h"
11 11
12 MockPermissionPrompt::~MockPermissionPrompt() { 12 MockPermissionPrompt::~MockPermissionPrompt() {
13 Hide(); 13 Hide();
14 } 14 }
15 15
16 void MockPermissionPrompt::Show() { 16 void MockPermissionPrompt::Show() {
17 factory_->ShowView(this); 17 factory_->ShowView(this);
18 factory_->show_count_++; 18 factory_->show_count_++;
19 factory_->requests_count_ = manager_->requests_.size(); 19 factory_->requests_count_ = manager_->requests_.size();
20 for (const PermissionRequest* request : manager_->requests_) { 20 for (const PermissionRequest* request : manager_->requests_) {
21 factory_->request_types_seen_.push_back( 21 factory_->request_types_seen_.push_back(
22 request->GetPermissionRequestType()); 22 request->GetPermissionRequestType());
23 } 23 }
24 factory_->UpdateResponseType(); 24 factory_->UpdateResponseType();
25 is_visible_ = true; 25 is_visible_ = true;
26 } 26 }
27 27
28 bool MockPermissionPrompt::CanAcceptRequestUpdate() { 28 bool MockPermissionPrompt::MaybeCancelRequest() {
29 if (can_update_ui_)
30 Hide();
29 return can_update_ui_; 31 return can_update_ui_;
30 } 32 }
31 33
32 bool MockPermissionPrompt::HidesAutomatically() { 34 bool MockPermissionPrompt::HidesAutomatically() {
33 return false; 35 return false;
34 } 36 }
35 37
36 void MockPermissionPrompt::Hide() { 38 void MockPermissionPrompt::Hide() {
37 if (is_visible_ && factory_) 39 if (is_visible_ && factory_)
38 factory_->HideView(this); 40 factory_->HideView(this);
(...skipping 11 matching lines...) Expand all
50 bool MockPermissionPrompt::IsVisible() { 52 bool MockPermissionPrompt::IsVisible() {
51 return is_visible_; 53 return is_visible_;
52 } 54 }
53 55
54 MockPermissionPrompt::MockPermissionPrompt(MockPermissionPromptFactory* factory, 56 MockPermissionPrompt::MockPermissionPrompt(MockPermissionPromptFactory* factory,
55 PermissionRequestManager* manager) 57 PermissionRequestManager* manager)
56 : factory_(factory), 58 : factory_(factory),
57 manager_(manager), 59 manager_(manager),
58 can_update_ui_(true), 60 can_update_ui_(true),
59 is_visible_(false) {} 61 is_visible_(false) {}
OLDNEW
« no previous file with comments | « chrome/browser/ui/permission_bubble/mock_permission_prompt.h ('k') | chrome/browser/ui/permission_bubble/permission_prompt.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698