| 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 #import "chrome/browser/ui/cocoa/browser_window_cocoa.h" |
| 6 |
| 7 #include <memory> |
| 8 |
| 5 #include "base/mac/scoped_nsobject.h" | 9 #include "base/mac/scoped_nsobject.h" |
| 6 #include "base/memory/scoped_ptr.h" | |
| 7 #include "base/strings/string_util.h" | 10 #include "base/strings/string_util.h" |
| 8 #include "chrome/browser/chrome_notification_types.h" | 11 #include "chrome/browser/chrome_notification_types.h" |
| 9 #include "chrome/browser/fullscreen.h" | 12 #include "chrome/browser/fullscreen.h" |
| 10 #include "chrome/browser/ui/bookmarks/bookmark_utils.h" | 13 #include "chrome/browser/ui/bookmarks/bookmark_utils.h" |
| 11 #import "chrome/browser/ui/cocoa/browser_window_cocoa.h" | |
| 12 #import "chrome/browser/ui/cocoa/browser_window_controller.h" | 14 #import "chrome/browser/ui/cocoa/browser_window_controller.h" |
| 13 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" | 15 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" |
| 14 #include "chrome/grit/generated_resources.h" | 16 #include "chrome/grit/generated_resources.h" |
| 15 #include "chrome/test/base/testing_profile.h" | 17 #include "chrome/test/base/testing_profile.h" |
| 16 #include "content/public/browser/notification_details.h" | 18 #include "content/public/browser/notification_details.h" |
| 17 #include "testing/gtest/include/gtest/gtest.h" | 19 #include "testing/gtest/include/gtest/gtest.h" |
| 18 #import "third_party/ocmock/OCMock/OCMock.h" | 20 #import "third_party/ocmock/OCMock/OCMock.h" |
| 19 #import "third_party/ocmock/gtest_support.h" | 21 #import "third_party/ocmock/gtest_support.h" |
| 20 #include "ui/base/l10n/l10n_util_mac.h" | 22 #include "ui/base/l10n/l10n_util_mac.h" |
| 21 | 23 |
| (...skipping 10 matching lines...) Expand all Loading... |
| 32 void TearDown() override { | 34 void TearDown() override { |
| 33 [controller_ close]; | 35 [controller_ close]; |
| 34 CocoaProfileTest::TearDown(); | 36 CocoaProfileTest::TearDown(); |
| 35 } | 37 } |
| 36 | 38 |
| 37 public: | 39 public: |
| 38 BrowserWindowController* controller_; | 40 BrowserWindowController* controller_; |
| 39 }; | 41 }; |
| 40 | 42 |
| 41 TEST_F(BrowserWindowCocoaTest, TestBookmarkBarVisible) { | 43 TEST_F(BrowserWindowCocoaTest, TestBookmarkBarVisible) { |
| 42 scoped_ptr<BrowserWindowCocoa> bwc( | 44 std::unique_ptr<BrowserWindowCocoa> bwc( |
| 43 new BrowserWindowCocoa(browser(), controller_)); | 45 new BrowserWindowCocoa(browser(), controller_)); |
| 44 | 46 |
| 45 bool before = bwc->IsBookmarkBarVisible(); | 47 bool before = bwc->IsBookmarkBarVisible(); |
| 46 chrome::ToggleBookmarkBarWhenVisible(profile()); | 48 chrome::ToggleBookmarkBarWhenVisible(profile()); |
| 47 EXPECT_NE(before, bwc->IsBookmarkBarVisible()); | 49 EXPECT_NE(before, bwc->IsBookmarkBarVisible()); |
| 48 | 50 |
| 49 chrome::ToggleBookmarkBarWhenVisible(profile()); | 51 chrome::ToggleBookmarkBarWhenVisible(profile()); |
| 50 EXPECT_EQ(before, bwc->IsBookmarkBarVisible()); | 52 EXPECT_EQ(before, bwc->IsBookmarkBarVisible()); |
| 51 } | 53 } |
| 52 | 54 |
| 53 TEST_F(BrowserWindowCocoaTest, TestWindowTitle) { | 55 TEST_F(BrowserWindowCocoaTest, TestWindowTitle) { |
| 54 scoped_ptr<BrowserWindowCocoa> bwc( | 56 std::unique_ptr<BrowserWindowCocoa> bwc( |
| 55 new BrowserWindowCocoa(browser(), controller_)); | 57 new BrowserWindowCocoa(browser(), controller_)); |
| 56 NSString* playing_emoji = @"🔊"; | 58 NSString* playing_emoji = @"🔊"; |
| 57 NSString* muting_emoji = @"🔇"; | 59 NSString* muting_emoji = @"🔇"; |
| 58 EXPECT_EQ(static_cast<NSUInteger>(NSNotFound), | 60 EXPECT_EQ(static_cast<NSUInteger>(NSNotFound), |
| 59 [bwc->WindowTitle() rangeOfString:playing_emoji].location); | 61 [bwc->WindowTitle() rangeOfString:playing_emoji].location); |
| 60 EXPECT_EQ(static_cast<NSUInteger>(NSNotFound), | 62 EXPECT_EQ(static_cast<NSUInteger>(NSNotFound), |
| 61 [bwc->WindowTitle() rangeOfString:muting_emoji].location); | 63 [bwc->WindowTitle() rangeOfString:muting_emoji].location); |
| 62 bwc->UpdateAlertState(TabAlertState::AUDIO_PLAYING); | 64 bwc->UpdateAlertState(TabAlertState::AUDIO_PLAYING); |
| 63 EXPECT_NE(static_cast<NSUInteger>(NSNotFound), | 65 EXPECT_NE(static_cast<NSUInteger>(NSNotFound), |
| 64 [bwc->WindowTitle() rangeOfString:playing_emoji].location); | 66 [bwc->WindowTitle() rangeOfString:playing_emoji].location); |
| 65 bwc->UpdateAlertState(TabAlertState::AUDIO_MUTING); | 67 bwc->UpdateAlertState(TabAlertState::AUDIO_MUTING); |
| 66 EXPECT_NE(static_cast<NSUInteger>(NSNotFound), | 68 EXPECT_NE(static_cast<NSUInteger>(NSNotFound), |
| 67 [bwc->WindowTitle() rangeOfString:muting_emoji].location); | 69 [bwc->WindowTitle() rangeOfString:muting_emoji].location); |
| 68 bwc->UpdateAlertState(TabAlertState::NONE); | 70 bwc->UpdateAlertState(TabAlertState::NONE); |
| 69 EXPECT_EQ(static_cast<NSUInteger>(NSNotFound), | 71 EXPECT_EQ(static_cast<NSUInteger>(NSNotFound), |
| 70 [bwc->WindowTitle() rangeOfString:playing_emoji].location); | 72 [bwc->WindowTitle() rangeOfString:playing_emoji].location); |
| 71 EXPECT_EQ(static_cast<NSUInteger>(NSNotFound), | 73 EXPECT_EQ(static_cast<NSUInteger>(NSNotFound), |
| 72 [bwc->WindowTitle() rangeOfString:muting_emoji].location); | 74 [bwc->WindowTitle() rangeOfString:muting_emoji].location); |
| 73 } | 75 } |
| 74 | 76 |
| 75 // Test that IsMaximized() returns false when the browser window goes from | 77 // Test that IsMaximized() returns false when the browser window goes from |
| 76 // maximized to minimized state - http://crbug/452976. | 78 // maximized to minimized state - http://crbug/452976. |
| 77 TEST_F(BrowserWindowCocoaTest, TestMinimizeState) { | 79 TEST_F(BrowserWindowCocoaTest, TestMinimizeState) { |
| 78 scoped_ptr<BrowserWindowCocoa> bwc( | 80 std::unique_ptr<BrowserWindowCocoa> bwc( |
| 79 new BrowserWindowCocoa(browser(), controller_)); | 81 new BrowserWindowCocoa(browser(), controller_)); |
| 80 | 82 |
| 81 EXPECT_FALSE(bwc->IsMinimized()); | 83 EXPECT_FALSE(bwc->IsMinimized()); |
| 82 bwc->Maximize(); | 84 bwc->Maximize(); |
| 83 EXPECT_TRUE(bwc->IsMaximized()); | 85 EXPECT_TRUE(bwc->IsMaximized()); |
| 84 EXPECT_FALSE(bwc->IsMinimized()); | 86 EXPECT_FALSE(bwc->IsMinimized()); |
| 85 bwc->Minimize(); | 87 bwc->Minimize(); |
| 86 EXPECT_FALSE(bwc->IsMaximized()); | 88 EXPECT_FALSE(bwc->IsMaximized()); |
| 87 EXPECT_TRUE(bwc->IsMinimized()); | 89 EXPECT_TRUE(bwc->IsMinimized()); |
| 88 bwc->Restore(); | 90 bwc->Restore(); |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 202 [[[window_ stub] andReturn:nil] delegate]; | 204 [[[window_ stub] andReturn:nil] delegate]; |
| 203 [[[controller_ stub] andReturn:window_] window]; | 205 [[[controller_ stub] andReturn:window_] window]; |
| 204 [[window_ expect] orderOut:nil]; | 206 [[window_ expect] orderOut:nil]; |
| 205 [[window_ expect] close]; | 207 [[window_ expect] close]; |
| 206 CreateAndCloseBrowserWindow(); | 208 CreateAndCloseBrowserWindow(); |
| 207 EXPECT_OCMOCK_VERIFY(controller_); | 209 EXPECT_OCMOCK_VERIFY(controller_); |
| 208 EXPECT_OCMOCK_VERIFY(window_); | 210 EXPECT_OCMOCK_VERIFY(window_); |
| 209 } | 211 } |
| 210 | 212 |
| 211 // TODO(???): test other methods of BrowserWindowCocoa | 213 // TODO(???): test other methods of BrowserWindowCocoa |
| OLD | NEW |