OLD | NEW |
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/browser_window_controller.h" | 5 #import "chrome/browser/ui/cocoa/browser_window_controller.h" |
6 | 6 |
7 #include "base/mac/mac_util.h" | 7 #include "base/mac/mac_util.h" |
8 #import "base/mac/scoped_nsobject.h" | 8 #import "base/mac/scoped_nsobject.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
63 } | 63 } |
64 | 64 |
65 - (NSView*)bookmarkView { | 65 - (NSView*)bookmarkView { |
66 return [bookmarkBarController_ view]; | 66 return [bookmarkBarController_ view]; |
67 } | 67 } |
68 | 68 |
69 - (NSView*)findBarView { | 69 - (NSView*)findBarView { |
70 return [findBarCocoaController_ view]; | 70 return [findBarCocoaController_ view]; |
71 } | 71 } |
72 | 72 |
73 - (NSSplitView*)devToolsView { | |
74 return static_cast<NSSplitView*>([devToolsController_ view]); | |
75 } | |
76 | |
77 - (BOOL)bookmarkBarVisible { | 73 - (BOOL)bookmarkBarVisible { |
78 return [bookmarkBarController_ isVisible]; | 74 return [bookmarkBarController_ isVisible]; |
79 } | 75 } |
80 @end | 76 @end |
81 | 77 |
82 class BrowserWindowControllerTest : public CocoaProfileTest { | 78 class BrowserWindowControllerTest : public CocoaProfileTest { |
83 public: | 79 public: |
84 virtual void SetUp() { | 80 virtual void SetUp() { |
85 CocoaProfileTest::SetUp(); | 81 CocoaProfileTest::SetUp(); |
86 ASSERT_TRUE(browser()); | 82 ASSERT_TRUE(browser()); |
(...skipping 539 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
626 [subviews indexOfObject:[controller_ toolbarView]]; | 622 [subviews indexOfObject:[controller_ toolbarView]]; |
627 EXPECT_NE(NSNotFound, toolbar_index); | 623 EXPECT_NE(NSNotFound, toolbar_index); |
628 NSUInteger bookmark_index = | 624 NSUInteger bookmark_index = |
629 [subviews indexOfObject:[controller_ bookmarkView]]; | 625 [subviews indexOfObject:[controller_ bookmarkView]]; |
630 EXPECT_NE(NSNotFound, bookmark_index); | 626 EXPECT_NE(NSNotFound, bookmark_index); |
631 | 627 |
632 EXPECT_GT(findBar_index, toolbar_index); | 628 EXPECT_GT(findBar_index, toolbar_index); |
633 EXPECT_GT(findBar_index, bookmark_index); | 629 EXPECT_GT(findBar_index, bookmark_index); |
634 } | 630 } |
635 | 631 |
636 // Tests that status bubble's base frame does move when devTools are docked. | |
637 TEST_F(BrowserWindowControllerTest, TestStatusBubblePositioning) { | |
638 ASSERT_EQ(1U, [[[controller_ devToolsView] subviews] count]); | |
639 | |
640 NSPoint bubbleOrigin = [controller_ statusBubbleBaseFrame].origin; | |
641 | |
642 // Add a fake subview to devToolsView to emulate docked devTools. | |
643 base::scoped_nsobject<NSView> view( | |
644 [[NSView alloc] initWithFrame:NSMakeRect(0, 0, 10, 10)]); | |
645 [[controller_ devToolsView] addSubview:view]; | |
646 [[controller_ devToolsView] adjustSubviews]; | |
647 | |
648 NSPoint bubbleOriginWithDevTools = [controller_ statusBubbleBaseFrame].origin; | |
649 | |
650 // Make sure that status bubble frame is moved. | |
651 EXPECT_FALSE(NSEqualPoints(bubbleOrigin, bubbleOriginWithDevTools)); | |
652 } | |
653 | |
654 TEST_F(BrowserWindowControllerTest, TestSigninMenuItemNoErrors) { | 632 TEST_F(BrowserWindowControllerTest, TestSigninMenuItemNoErrors) { |
655 base::scoped_nsobject<NSMenuItem> syncMenuItem( | 633 base::scoped_nsobject<NSMenuItem> syncMenuItem( |
656 [[NSMenuItem alloc] initWithTitle:@"" | 634 [[NSMenuItem alloc] initWithTitle:@"" |
657 action:@selector(commandDispatch) | 635 action:@selector(commandDispatch) |
658 keyEquivalent:@""]); | 636 keyEquivalent:@""]); |
659 [syncMenuItem setTag:IDC_SHOW_SYNC_SETUP]; | 637 [syncMenuItem setTag:IDC_SHOW_SYNC_SETUP]; |
660 | 638 |
661 NSString* startSignin = | 639 NSString* startSignin = |
662 l10n_util::GetNSStringFWithFixup( | 640 l10n_util::GetNSStringFWithFixup( |
663 IDS_SYNC_MENU_PRE_SYNCED_LABEL, | 641 IDS_SYNC_MENU_PRE_SYNCED_LABEL, |
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
898 testFullscreenWindow_.reset( | 876 testFullscreenWindow_.reset( |
899 [[NSWindow alloc] initWithContentRect:NSMakeRect(0,0,400,400) | 877 [[NSWindow alloc] initWithContentRect:NSMakeRect(0,0,400,400) |
900 styleMask:NSBorderlessWindowMask | 878 styleMask:NSBorderlessWindowMask |
901 backing:NSBackingStoreBuffered | 879 backing:NSBackingStoreBuffered |
902 defer:NO]); | 880 defer:NO]); |
903 return testFullscreenWindow_.get(); | 881 return testFullscreenWindow_.get(); |
904 } | 882 } |
905 @end | 883 @end |
906 | 884 |
907 /* TODO(???): test other methods of BrowserWindowController */ | 885 /* TODO(???): test other methods of BrowserWindowController */ |
OLD | NEW |