OLD | NEW |
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 #include "base/mac/scoped_nsobject.h" | 5 #include "base/mac/scoped_nsobject.h" |
6 #include "base/memory/scoped_ptr.h" | 6 #include "base/memory/scoped_ptr.h" |
7 #include "base/strings/string_util.h" | 7 #include "base/strings/string_util.h" |
8 #include "chrome/browser/chrome_notification_types.h" | 8 #include "chrome/browser/chrome_notification_types.h" |
9 #include "chrome/browser/fullscreen.h" | 9 #include "chrome/browser/fullscreen.h" |
10 #include "chrome/browser/ui/bookmarks/bookmark_utils.h" | 10 #include "chrome/browser/ui/bookmarks/bookmark_utils.h" |
(...skipping 30 matching lines...) Expand all Loading... |
41 new BrowserWindowCocoa(browser(), controller_)); | 41 new BrowserWindowCocoa(browser(), controller_)); |
42 | 42 |
43 bool before = bwc->IsBookmarkBarVisible(); | 43 bool before = bwc->IsBookmarkBarVisible(); |
44 chrome::ToggleBookmarkBarWhenVisible(profile()); | 44 chrome::ToggleBookmarkBarWhenVisible(profile()); |
45 EXPECT_NE(before, bwc->IsBookmarkBarVisible()); | 45 EXPECT_NE(before, bwc->IsBookmarkBarVisible()); |
46 | 46 |
47 chrome::ToggleBookmarkBarWhenVisible(profile()); | 47 chrome::ToggleBookmarkBarWhenVisible(profile()); |
48 EXPECT_EQ(before, bwc->IsBookmarkBarVisible()); | 48 EXPECT_EQ(before, bwc->IsBookmarkBarVisible()); |
49 } | 49 } |
50 | 50 |
| 51 // Test that IsMaximized() returns false when the browser window goes from |
| 52 // maximized to minimized state - http://crbug/452976. |
| 53 TEST_F(BrowserWindowCocoaTest, TestMinimizeState) { |
| 54 scoped_ptr<BrowserWindowCocoa> bwc( |
| 55 new BrowserWindowCocoa(browser(), controller_)); |
| 56 |
| 57 EXPECT_FALSE(bwc->IsMinimized()); |
| 58 bwc->Maximize(); |
| 59 EXPECT_TRUE(bwc->IsMaximized()); |
| 60 EXPECT_FALSE(bwc->IsMinimized()); |
| 61 bwc->Minimize(); |
| 62 EXPECT_FALSE(bwc->IsMaximized()); |
| 63 EXPECT_TRUE(bwc->IsMinimized()); |
| 64 bwc->Restore(); |
| 65 } |
| 66 |
51 // Tests that BrowserWindowCocoa::Close mimics the behavior of | 67 // Tests that BrowserWindowCocoa::Close mimics the behavior of |
52 // -[NSWindow performClose:]. | 68 // -[NSWindow performClose:]. |
53 class BrowserWindowCocoaCloseTest : public CocoaProfileTest { | 69 class BrowserWindowCocoaCloseTest : public CocoaProfileTest { |
54 public: | 70 public: |
55 BrowserWindowCocoaCloseTest() | 71 BrowserWindowCocoaCloseTest() |
56 : controller_( | 72 : controller_( |
57 [OCMockObject mockForClass:[BrowserWindowController class]]), | 73 [OCMockObject mockForClass:[BrowserWindowController class]]), |
58 window_([OCMockObject mockForClass:[NSWindow class]]) { | 74 window_([OCMockObject mockForClass:[NSWindow class]]) { |
59 [[[controller_ stub] andReturn:nil] overlayWindow]; | 75 [[[controller_ stub] andReturn:nil] overlayWindow]; |
60 } | 76 } |
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
162 [[[window_ stub] andReturn:nil] delegate]; | 178 [[[window_ stub] andReturn:nil] delegate]; |
163 [[[controller_ stub] andReturn:window_] window]; | 179 [[[controller_ stub] andReturn:window_] window]; |
164 [[window_ expect] orderOut:nil]; | 180 [[window_ expect] orderOut:nil]; |
165 [[window_ expect] close]; | 181 [[window_ expect] close]; |
166 CreateAndCloseBrowserWindow(); | 182 CreateAndCloseBrowserWindow(); |
167 EXPECT_OCMOCK_VERIFY(controller_); | 183 EXPECT_OCMOCK_VERIFY(controller_); |
168 EXPECT_OCMOCK_VERIFY(window_); | 184 EXPECT_OCMOCK_VERIFY(window_); |
169 } | 185 } |
170 | 186 |
171 // TODO(???): test other methods of BrowserWindowCocoa | 187 // TODO(???): test other methods of BrowserWindowCocoa |
OLD | NEW |