Fix constrained window position for inactive tab

chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller_unittest.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #import "testing/gtest_mac.h"
 
 class ConstrainedWindowSheetControllerTest : public CocoaTest {
  protected:
@@ skipping 48 matching lines @@
     EXPECT_TRUE(controller);
     [controller parentViewDidBecomeActive:active_tab_view_];
   }
 
   NSRect GetViewFrameInScreenCoordinates(NSView* view) {
     NSRect rect = [view convertRect:[view bounds] toView:nil];
     rect.origin = [[view window] convertBaseToScreen:rect.origin];
     return rect;
   }
 
+  void VerifySheetXPosition(NSRect sheet_frame, NSView* parent_view) {
+    NSRect parent_frame = GetViewFrameInScreenCoordinates(parent_view);
+    CGFloat expected_x = NSMinX(parent_frame) +
+        (NSWidth(parent_frame) - NSWidth(sheet_frame)) / 2.0;
+    EXPECT_EQ(expected_x, NSMinX(sheet_frame));
+  }
+
   scoped_nsobject<NSWindow> sheet_;
   scoped_nsobject<ConstrainedWindowSheetController> controller_;
   scoped_nsobject<NSMutableArray> tab_views_;
   scoped_nsobject<NSView> active_tab_view_;
   scoped_nsobject<NSView> tab0_;
   scoped_nsobject<NSView> tab1_;
 };
 
 // Test showing then hiding the sheet.
 TEST_F(ConstrainedWindowSheetControllerTest, ShowHide) {
@@ skipping 22 matching lines @@
 }
 
 // Test that adding a sheet to an inactive view doesn't show it.
 TEST_F(ConstrainedWindowSheetControllerTest, AddToInactiveTab) {
   ActivateTabView(tab0_);
   [controller_ showSheet:sheet_ forParentView:tab1_];
   EXPECT_EQ(0.0, [sheet_ alphaValue]);
 
   ActivateTabView(tab1_);
   EXPECT_EQ(1.0, [sheet_ alphaValue]);
+  VerifySheetXPosition([sheet_ frame], tab1_);
 }
 
 // Test that two parent windows with two sheet controllers don't conflict.
 TEST_F(ConstrainedWindowSheetControllerTest, TwoParentWindows) {
   scoped_nsobject<NSWindow> parent_window2([[NSWindow alloc]
       initWithContentRect:NSMakeRect(0, 0, 30, 30)
                 styleMask:NSTitledWindowMask
                   backing:NSBackingStoreBuffered
                     defer:NO]);
   [parent_window2 setReleasedWhenClosed:NO];
@@ skipping 13 matching lines @@
 
 // Test that using a top level parent view works.
 TEST_F(ConstrainedWindowSheetControllerTest, TopLevelView) {
   NSView* parentView = [[test_window() contentView] superview];
   [controller_ parentViewDidBecomeActive:parentView];
 
   EXPECT_FALSE([sheet_ isVisible]);
   [controller_ showSheet:sheet_ forParentView:parentView];
   EXPECT_TRUE([ConstrainedWindowSheetController controllerForSheet:sheet_]);
   EXPECT_TRUE([sheet_ isVisible]);
-
-  NSRect parent_frame = GetViewFrameInScreenCoordinates(parentView);
-  NSRect sheet_frame = [sheet_ frame];
-  CGFloat expected_x = NSMinX(parent_frame) +
-      (NSWidth(parent_frame) - NSWidth(sheet_frame)) / 2.0;
-  EXPECT_EQ(expected_x, NSMinX(sheet_frame));
+  VerifySheetXPosition([sheet_ frame], parentView);
 }
 
 // Test that resizing sheet works.
 TEST_F(ConstrainedWindowSheetControllerTest, Resize) {
   [controller_ showSheet:sheet_ forParentView:active_tab_view_];
 
   NSRect old_frame = [sheet_ frame];
 
   NSRect sheet_frame;
   sheet_frame.size = NSMakeSize(NSWidth(old_frame) + 100,
                                 NSHeight(old_frame) + 50);
   sheet_frame.origin = [controller_ originForSheet:sheet_
                                     withWindowSize:sheet_frame.size];
 
   // Y pos should not have changed.
   EXPECT_EQ(NSMaxY(sheet_frame), NSMaxY(old_frame));
 
   // X pos should be centered on parent view.
-  NSRect parent_frame = GetViewFrameInScreenCoordinates(active_tab_view_);
-  CGFloat expected_x = NSMinX(parent_frame) +
-      (NSWidth(parent_frame) - NSWidth(sheet_frame)) / 2.0;
-  EXPECT_EQ(expected_x, NSMinX(sheet_frame));
+  VerifySheetXPosition(sheet_frame, active_tab_view_);
 }
 
 // Test that resizing a hidden sheet works.
 TEST_F(ConstrainedWindowSheetControllerTest, ResizeHiddenSheet) {
   [controller_ showSheet:sheet_ forParentView:tab0_];
   EXPECT_EQ(1.0, [sheet_ alphaValue]);
   ActivateTabView(tab1_);
   EXPECT_EQ(0.0, [sheet_ alphaValue]);
 
   NSRect old_frame = [sheet_ frame];
   NSRect new_inactive_frame = NSInsetRect(old_frame, -30, -40);
   [sheet_ setFrame:new_inactive_frame display:YES];
 
   ActivateTabView(tab0_);
   EXPECT_EQ(1.0, [sheet_ alphaValue]);
 
   NSRect new_active_frame = [sheet_ frame];
-  EXPECT_TRUE(NSEqualRects(new_inactive_frame, new_active_frame));
+  EXPECT_EQ(NSWidth(new_inactive_frame), NSWidth(new_active_frame));
+  EXPECT_EQ(NSHeight(new_inactive_frame), NSHeight(new_active_frame));
 }