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

Side by Side Diff: chrome/browser/ui/cocoa/infobars/confirm_infobar_controller_unittest.mm

Issue 671653002: Standardize usage of virtual/override/final in chrome/browser/ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/infobars/confirm_infobar_controller.h" 5 #import "chrome/browser/ui/cocoa/infobars/confirm_infobar_controller.h"
6 6
7 #include "base/mac/scoped_nsobject.h" 7 #include "base/mac/scoped_nsobject.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "base/strings/sys_string_conversions.h" 9 #include "base/strings/sys_string_conversions.h"
10 #include "chrome/browser/infobars/infobar_service.h" 10 #include "chrome/browser/infobars/infobar_service.h"
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 return static_cast<MockConfirmInfoBarDelegate*>(infobar_->delegate()); 123 return static_cast<MockConfirmInfoBarDelegate*>(infobar_->delegate());
124 } 124 }
125 125
126 base::scoped_nsobject<id> container_; 126 base::scoped_nsobject<id> container_;
127 base::scoped_nsobject<ConfirmInfoBarController> controller_; 127 base::scoped_nsobject<ConfirmInfoBarController> controller_;
128 bool closed_delegate_ok_clicked_; 128 bool closed_delegate_ok_clicked_;
129 bool closed_delegate_cancel_clicked_; 129 bool closed_delegate_cancel_clicked_;
130 bool closed_delegate_link_clicked_; 130 bool closed_delegate_link_clicked_;
131 131
132 private: 132 private:
133 virtual void OnInfoBarDelegateClosed() override { 133 void OnInfoBarDelegateClosed() override {
134 closed_delegate_ok_clicked_ = delegate()->ok_clicked(); 134 closed_delegate_ok_clicked_ = delegate()->ok_clicked();
135 closed_delegate_cancel_clicked_ = delegate()->cancel_clicked(); 135 closed_delegate_cancel_clicked_ = delegate()->cancel_clicked();
136 closed_delegate_link_clicked_ = delegate()->link_clicked(); 136 closed_delegate_link_clicked_ = delegate()->link_clicked();
137 delegate_closed_ = true; 137 delegate_closed_ = true;
138 controller_.reset(); 138 controller_.reset();
139 } 139 }
140 140
141 scoped_ptr<WebContents> web_contents_; 141 scoped_ptr<WebContents> web_contents_;
142 InfoBarCocoa* infobar_; // Weak, will delete itself. 142 InfoBarCocoa* infobar_; // Weak, will delete itself.
143 bool delegate_closed_; 143 bool delegate_closed_;
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 const CGFloat width = 20; 238 const CGFloat width = 20;
239 NSRect newViewFrame = [[controller_ view] frame]; 239 NSRect newViewFrame = [[controller_ view] frame];
240 newViewFrame.size.width += width; 240 newViewFrame.size.width += width;
241 [[controller_ view] setFrame:newViewFrame]; 241 [[controller_ view] setFrame:newViewFrame];
242 242
243 NSRect newLabelFrame = [controller_ labelFrame]; 243 NSRect newLabelFrame = [controller_ labelFrame];
244 EXPECT_EQ(NSWidth(newLabelFrame), NSWidth(originalLabelFrame) + width); 244 EXPECT_EQ(NSWidth(newLabelFrame), NSWidth(originalLabelFrame) + width);
245 } 245 }
246 246
247 } // namespace 247 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698