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

Side by Side Diff: chrome/browser/ui/cocoa/tabpose_window_unittest.mm

Issue 10827418: Fix Mac compile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #import "chrome/browser/ui/cocoa/tabpose_window.h" 5 #import "chrome/browser/ui/cocoa/tabpose_window.h"
6 6
7 #include "base/mac/mac_util.h" 7 #include "base/mac/mac_util.h"
8 #include "chrome/browser/ui/browser_tabstrip.h" 8 #include "chrome/browser/ui/browser_tabstrip.h"
9 #include "chrome/browser/ui/browser_window.h" 9 #include "chrome/browser/ui/browser_window.h"
10 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" 10 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
(...skipping 20 matching lines...) Expand all
31 browser()->tab_strip_model()->AppendTabContents( 31 browser()->tab_strip_model()->AppendTabContents(
32 tab_contents, /*foreground=*/true); 32 tab_contents, /*foreground=*/true);
33 } 33 }
34 34
35 scoped_refptr<SiteInstance> site_instance_; 35 scoped_refptr<SiteInstance> site_instance_;
36 }; 36 };
37 37
38 TEST_F(TabposeWindowTest, TestShow) { 38 TEST_F(TabposeWindowTest, TestShow) {
39 // Skip this test on 10.7 39 // Skip this test on 10.7
40 // http://code.google.com/p/chromium/issues/detail?id=127845 40 // http://code.google.com/p/chromium/issues/detail?id=127845
41 if (IsOSLionOrLater()) { 41 if (base::mac::IsOSLionOrLater()) {
42 return; 42 return;
43 } 43 }
44 44
45 NSWindow* parent = browser()->window()->GetNativeWindow(); 45 NSWindow* parent = browser()->window()->GetNativeWindow();
46 46
47 [parent orderFront:nil]; 47 [parent orderFront:nil];
48 EXPECT_TRUE([parent isVisible]); 48 EXPECT_TRUE([parent isVisible]);
49 49
50 // Add a few tabs to the tab strip model. 50 // Add a few tabs to the tab strip model.
51 for (int i = 0; i < 3; ++i) 51 for (int i = 0; i < 3; ++i)
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 DCHECK_EQ([window selectedIndex], 0); 112 DCHECK_EQ([window selectedIndex], 0);
113 113
114 [window selectTileAtIndexWithoutAnimation:1]; 114 [window selectTileAtIndexWithoutAnimation:1];
115 model->CloseTabContentsAt(0, TabStripModel::CLOSE_NONE); 115 model->CloseTabContentsAt(0, TabStripModel::CLOSE_NONE);
116 DCHECK_EQ([window thumbnailLayerCount], 1u); 116 DCHECK_EQ([window thumbnailLayerCount], 1u);
117 DCHECK_EQ([window selectedIndex], 0); 117 DCHECK_EQ([window selectedIndex], 0);
118 118
119 // Should release the window. 119 // Should release the window.
120 [window mouseDown:nil]; 120 [window mouseDown:nil];
121 } 121 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698