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

Side by Side Diff: chrome/browser/ui/cocoa/website_settings/permission_bubble_controller_unittest.mm

Issue 1100223002: Update {virtual,override} to follow C++11 style in chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 8 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 #import "chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.h " 5 #import "chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.h "
6 6
7 #include <Carbon/Carbon.h> 7 #include <Carbon/Carbon.h>
8 8
9 #include "base/mac/foundation_util.h" 9 #include "base/mac/foundation_util.h"
10 #include "base/stl_util.h" 10 #include "base/stl_util.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 public PermissionBubbleView::Delegate { 45 public PermissionBubbleView::Delegate {
46 public: 46 public:
47 47
48 MOCK_METHOD2(ToggleAccept, void(int, bool)); 48 MOCK_METHOD2(ToggleAccept, void(int, bool));
49 MOCK_METHOD0(SetCustomizationMode, void()); 49 MOCK_METHOD0(SetCustomizationMode, void());
50 MOCK_METHOD0(Accept, void()); 50 MOCK_METHOD0(Accept, void());
51 MOCK_METHOD0(Deny, void()); 51 MOCK_METHOD0(Deny, void());
52 MOCK_METHOD0(Closing, void()); 52 MOCK_METHOD0(Closing, void());
53 MOCK_METHOD1(SetView, void(PermissionBubbleView*)); 53 MOCK_METHOD1(SetView, void(PermissionBubbleView*));
54 54
55 virtual void SetUp() override { 55 void SetUp() override {
56 CocoaTest::SetUp(); 56 CocoaTest::SetUp();
57 bridge_.reset(new PermissionBubbleCocoa(nil)); 57 bridge_.reset(new PermissionBubbleCocoa(nil));
58 AddRequest(kPermissionA); 58 AddRequest(kPermissionA);
59 controller_ = [[PermissionBubbleController alloc] 59 controller_ = [[PermissionBubbleController alloc]
60 initWithParentWindow:test_window() 60 initWithParentWindow:test_window()
61 bridge:bridge_.get()]; 61 bridge:bridge_.get()];
62 } 62 }
63 63
64 virtual void TearDown() override { 64 void TearDown() override {
65 [controller_ close]; 65 [controller_ close];
66 chrome::testing::NSRunLoopRunAllPending(); 66 chrome::testing::NSRunLoopRunAllPending();
67 STLDeleteElements(&requests_); 67 STLDeleteElements(&requests_);
68 CocoaTest::TearDown(); 68 CocoaTest::TearDown();
69 } 69 }
70 70
71 void AddRequest(const std::string& title) { 71 void AddRequest(const std::string& title) {
72 MockPermissionBubbleRequest* request = new MockPermissionBubbleRequest( 72 MockPermissionBubbleRequest* request = new MockPermissionBubbleRequest(
73 title, 73 title,
74 l10n_util::GetStringUTF8(IDS_PERMISSION_ALLOW), 74 l10n_util::GetStringUTF8(IDS_PERMISSION_ALLOW),
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 withDelegate:this 299 withDelegate:this
300 forRequests:requests_ 300 forRequests:requests_
301 acceptStates:accept_states_]; 301 acceptStates:accept_states_];
302 302
303 EXPECT_TRUE([[controller_ window] isVisible]); 303 EXPECT_TRUE([[controller_ window] isVisible]);
304 [[controller_ window] 304 [[controller_ window]
305 performKeyEquivalent:cocoa_test_event_utils::KeyEventWithKeyCode( 305 performKeyEquivalent:cocoa_test_event_utils::KeyEventWithKeyCode(
306 kVK_Escape, '\e', NSKeyDown, 0)]; 306 kVK_Escape, '\e', NSKeyDown, 0)];
307 EXPECT_FALSE([[controller_ window] isVisible]); 307 EXPECT_FALSE([[controller_ window] isVisible]);
308 } 308 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698