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

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

Issue 3828009: Move scoped_nsdisable_screen_update from base to app/mac... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/cocoa/tabpose_window.h" 5 #import "chrome/browser/cocoa/tabpose_window.h"
6 6
7 #import "chrome/browser/browser_window.h" 7 #import "chrome/browser/browser_window.h"
8 #import "chrome/browser/cocoa/browser_test_helper.h" 8 #import "chrome/browser/cocoa/browser_test_helper.h"
9 #import "chrome/browser/cocoa/cocoa_test_helper.h" 9 #import "chrome/browser/cocoa/cocoa_test_helper.h"
10 #include "chrome/browser/renderer_host/site_instance.h" 10 #include "chrome/browser/renderer_host/site_instance.h"
(...skipping 25 matching lines...) Expand all
36 BrowserWindow* browser_window = browser_helper_.CreateBrowserWindow(); 36 BrowserWindow* browser_window = browser_helper_.CreateBrowserWindow();
37 NSWindow* parent = browser_window->GetNativeHandle(); 37 NSWindow* parent = browser_window->GetNativeHandle();
38 38
39 [parent orderFront:nil]; 39 [parent orderFront:nil];
40 EXPECT_TRUE([parent isVisible]); 40 EXPECT_TRUE([parent isVisible]);
41 41
42 // Add a few tabs to the tab strip model. 42 // Add a few tabs to the tab strip model.
43 for (int i = 0; i < 3; ++i) 43 for (int i = 0; i < 3; ++i)
44 AppendTabToStrip(); 44 AppendTabToStrip();
45 45
46 base::ScopedNSAutoreleasePool pool; 46 base::mac::ScopedNSAutoreleasePool pool;
47 TabposeWindow* window = 47 TabposeWindow* window =
48 [TabposeWindow openTabposeFor:parent 48 [TabposeWindow openTabposeFor:parent
49 rect:NSMakeRect(10, 20, 250, 160) 49 rect:NSMakeRect(10, 20, 250, 160)
50 slomo:NO 50 slomo:NO
51 tabStripModel:browser_helper_.browser()->tabstrip_model()]; 51 tabStripModel:browser_helper_.browser()->tabstrip_model()];
52 52
53 // Should release the window. 53 // Should release the window.
54 [window mouseDown:nil]; 54 [window mouseDown:nil];
55 55
56 browser_helper_.CloseBrowserWindow(); 56 browser_helper_.CloseBrowserWindow();
57 } 57 }
58 58
59 TEST_F(TabposeWindowTest, TestModelObserver) { 59 TEST_F(TabposeWindowTest, TestModelObserver) {
60 BrowserWindow* browser_window = browser_helper_.CreateBrowserWindow(); 60 BrowserWindow* browser_window = browser_helper_.CreateBrowserWindow();
61 NSWindow* parent = browser_window->GetNativeHandle(); 61 NSWindow* parent = browser_window->GetNativeHandle();
62 [parent orderFront:nil]; 62 [parent orderFront:nil];
63 63
64 // Add a few tabs to the tab strip model. 64 // Add a few tabs to the tab strip model.
65 for (int i = 0; i < 3; ++i) 65 for (int i = 0; i < 3; ++i)
66 AppendTabToStrip(); 66 AppendTabToStrip();
67 67
68 base::ScopedNSAutoreleasePool pool; 68 base::mac::ScopedNSAutoreleasePool pool;
69 TabposeWindow* window = 69 TabposeWindow* window =
70 [TabposeWindow openTabposeFor:parent 70 [TabposeWindow openTabposeFor:parent
71 rect:NSMakeRect(10, 20, 250, 160) 71 rect:NSMakeRect(10, 20, 250, 160)
72 slomo:NO 72 slomo:NO
73 tabStripModel:browser_helper_.browser()->tabstrip_model()]; 73 tabStripModel:browser_helper_.browser()->tabstrip_model()];
74 74
75 // Exercise all the model change events. 75 // Exercise all the model change events.
76 TabStripModel* model = browser_helper_.browser()->tabstrip_model(); 76 TabStripModel* model = browser_helper_.browser()->tabstrip_model();
77 DCHECK_EQ([window thumbnailLayerCount], 3u); 77 DCHECK_EQ([window thumbnailLayerCount], 3u);
78 DCHECK_EQ([window selectedIndex], 2); 78 DCHECK_EQ([window selectedIndex], 2);
(...skipping 30 matching lines...) Expand all
109 [window selectTileAtIndexWithoutAnimation:1]; 109 [window selectTileAtIndexWithoutAnimation:1];
110 model->CloseTabContentsAt(0, TabStripModel::CLOSE_NONE); 110 model->CloseTabContentsAt(0, TabStripModel::CLOSE_NONE);
111 DCHECK_EQ([window thumbnailLayerCount], 1u); 111 DCHECK_EQ([window thumbnailLayerCount], 1u);
112 DCHECK_EQ([window selectedIndex], 0); 112 DCHECK_EQ([window selectedIndex], 0);
113 113
114 // Should release the window. 114 // Should release the window.
115 [window mouseDown:nil]; 115 [window mouseDown:nil];
116 116
117 browser_helper_.CloseBrowserWindow(); 117 browser_helper_.CloseBrowserWindow();
118 } 118 }
OLDNEW
« no previous file with comments | « chrome/browser/cocoa/preferences_window_controller.mm ('k') | chrome/browser/cocoa/web_drop_target_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698