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

Side by Side Diff: chrome/browser/ui/website_settings/permission_bubble_manager_unittest.cc

Issue 885373004: Use customization mode by default in permission bubbles (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Test fixes etc. Created 5 years, 10 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/message_loop/message_loop.h" 6 #include "base/message_loop/message_loop.h"
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/browser/ui/website_settings/mock_permission_bubble_request.h" 8 #include "chrome/browser/ui/website_settings/mock_permission_bubble_request.h"
9 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h" 9 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h"
10 #include "chrome/browser/ui/website_settings/permission_bubble_request.h" 10 #include "chrome/browser/ui/website_settings/permission_bubble_request.h"
(...skipping 14 matching lines...) Expand all
25 can_accept_updates_ = true; 25 can_accept_updates_ = true;
26 delegate_ = NULL; 26 delegate_ = NULL;
27 permission_requests_.clear(); 27 permission_requests_.clear();
28 permission_states_.clear(); 28 permission_states_.clear();
29 } 29 }
30 30
31 // PermissionBubbleView: 31 // PermissionBubbleView:
32 void SetDelegate(Delegate* delegate) override { delegate_ = delegate; } 32 void SetDelegate(Delegate* delegate) override { delegate_ = delegate; }
33 33
34 void Show(const std::vector<PermissionBubbleRequest*>& requests, 34 void Show(const std::vector<PermissionBubbleRequest*>& requests,
35 const std::vector<bool>& accept_state, 35 const std::vector<bool>& accept_state) override {
36 bool customization_state_) override {
37 shown_ = true; 36 shown_ = true;
38 permission_requests_ = requests; 37 permission_requests_ = requests;
39 permission_states_ = accept_state; 38 permission_states_ = accept_state;
40 } 39 }
41 40
42 void Hide() override { shown_ = false; } 41 void Hide() override { shown_ = false; }
43 42
44 bool CanAcceptRequestUpdate() override { return can_accept_updates_; } 43 bool CanAcceptRequestUpdate() override { return can_accept_updates_; }
45 44
46 bool IsVisible() override { return shown_; } 45 bool IsVisible() override { return shown_; }
(...skipping 507 matching lines...) Expand 10 before | Expand all | Expand 10 after
554 WaitForFrameLoad(); 553 WaitForFrameLoad();
555 WaitForCoalescing(); 554 WaitForCoalescing();
556 manager_->AddRequest(&request1_); 555 manager_->AddRequest(&request1_);
557 manager_->AddRequest(&iframe_request_other_domain_); 556 manager_->AddRequest(&iframe_request_other_domain_);
558 manager_->AddRequest(&request2_); 557 manager_->AddRequest(&request2_);
559 base::MessageLoop::current()->RunUntilIdle(); 558 base::MessageLoop::current()->RunUntilIdle();
560 559
561 EXPECT_TRUE(view_.shown_); 560 EXPECT_TRUE(view_.shown_);
562 } 561 }
563 562
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698