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

Side by Side Diff: chrome/browser/ui/cocoa/constrained_window/constrained_window_mac_browsertest.mm

Issue 627043002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[a-s]* (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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/cocoa/constrained_window/constrained_window_mac.h" 5 #include "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h"
6 6
7 #include "chrome/browser/profiles/profile.h" 7 #include "chrome/browser/profiles/profile.h"
8 #include "chrome/browser/ui/browser.h" 8 #include "chrome/browser/ui/browser.h"
9 #include "chrome/browser/ui/browser_tabstrip.h" 9 #include "chrome/browser/ui/browser_tabstrip.h"
10 #include "chrome/browser/ui/browser_window.h" 10 #include "chrome/browser/ui/browser_window.h"
(...skipping 29 matching lines...) Expand all
40 initWithContentRect:NSMakeRect(0, 0, 30, 30) 40 initWithContentRect:NSMakeRect(0, 0, 30, 30)
41 styleMask:NSTitledWindowMask 41 styleMask:NSTitledWindowMask
42 backing:NSBackingStoreBuffered 42 backing:NSBackingStoreBuffered
43 defer:NO]); 43 defer:NO]);
44 [sheet_window_ setReleasedWhenClosed:NO]; 44 [sheet_window_ setReleasedWhenClosed:NO];
45 sheet_.reset([[CustomConstrainedWindowSheet alloc] 45 sheet_.reset([[CustomConstrainedWindowSheet alloc]
46 initWithCustomWindow:sheet_window_]); 46 initWithCustomWindow:sheet_window_]);
47 [sheet_ hideSheet]; 47 [sheet_ hideSheet];
48 } 48 }
49 49
50 virtual void SetUpOnMainThread() OVERRIDE { 50 virtual void SetUpOnMainThread() override {
51 AddTabAtIndex(1, GURL("about:blank"), ui::PAGE_TRANSITION_LINK); 51 AddTabAtIndex(1, GURL("about:blank"), ui::PAGE_TRANSITION_LINK);
52 tab0_ = browser()->tab_strip_model()->GetWebContentsAt(0); 52 tab0_ = browser()->tab_strip_model()->GetWebContentsAt(0);
53 tab1_ = browser()->tab_strip_model()->GetWebContentsAt(1); 53 tab1_ = browser()->tab_strip_model()->GetWebContentsAt(1);
54 EXPECT_EQ(tab1_, browser()->tab_strip_model()->GetActiveWebContents()); 54 EXPECT_EQ(tab1_, browser()->tab_strip_model()->GetActiveWebContents());
55 55
56 controller_ = [BrowserWindowController browserWindowControllerForWindow: 56 controller_ = [BrowserWindowController browserWindowControllerForWindow:
57 browser()->window()->GetNativeWindow()]; 57 browser()->window()->GetNativeWindow()];
58 EXPECT_TRUE(controller_); 58 EXPECT_TRUE(controller_);
59 tab_view0_ = [[controller_ tabStripController] viewAtIndex:0]; 59 tab_view0_ = [[controller_ tabStripController] viewAtIndex:0];
60 EXPECT_TRUE(tab_view0_); 60 EXPECT_TRUE(tab_view0_);
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 ConstrainedWindowMac dialog(&delegate, tab1_, sheet_); 147 ConstrainedWindowMac dialog(&delegate, tab1_, sheet_);
148 EXPECT_EQ(1.0, [sheet_window_ alphaValue]); 148 EXPECT_EQ(1.0, [sheet_window_ alphaValue]);
149 149
150 // Close the tab. 150 // Close the tab.
151 TabStripModel* tab_strip = browser()->tab_strip_model(); 151 TabStripModel* tab_strip = browser()->tab_strip_model();
152 EXPECT_EQ(2, tab_strip->count()); 152 EXPECT_EQ(2, tab_strip->count());
153 EXPECT_TRUE(tab_strip->CloseWebContentsAt(1, 153 EXPECT_TRUE(tab_strip->CloseWebContentsAt(1,
154 TabStripModel::CLOSE_USER_GESTURE)); 154 TabStripModel::CLOSE_USER_GESTURE));
155 EXPECT_EQ(1, tab_strip->count()); 155 EXPECT_EQ(1, tab_strip->count());
156 } 156 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698