[Mac] Move star button into page-actions area of omnibox.

chrome/browser/cocoa/toolbar_controller_unittest.mm

 // Copyright (c) 2009 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 <Cocoa/Cocoa.h>
 
 #import "base/scoped_nsobject.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/cocoa/browser_test_helper.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
@@ skipping 25 matching lines @@
 
 
 namespace {
 
 class ToolbarControllerTest : public CocoaTest {
  public:
 
   // Indexes that match the ordering returned by the private ToolbarController
   // |-toolbarViews| method.
   enum {
-    kBackIndex, kForwardIndex, kReloadIndex, kHomeIndex, kStarIndex, kGoIndex,
+    kBackIndex, kForwardIndex, kReloadIndex, kHomeIndex, kGoIndex,
     kPageIndex, kWrenchIndex, kLocationIndex,
     kBrowserActionContainerViewIndex
   };
 
   ToolbarControllerTest() {
     Browser* browser = helper_.browser();
     CommandUpdater* updater = browser->command_updater();
     // The default state for the commands is true, set a couple to false to
     // ensure they get picked up correct on initialization
     updater->UpdateCommandEnabled(IDC_BACK, false);
@@ skipping 14 matching lines @@
   // command in the updater. The views are in the declaration order of outlets.
   void CompareState(CommandUpdater* updater, NSArray* views) {
     EXPECT_EQ(updater->IsCommandEnabled(IDC_BACK),
               [[views objectAtIndex:kBackIndex] isEnabled] ? true : false);
     EXPECT_EQ(updater->IsCommandEnabled(IDC_FORWARD),
               [[views objectAtIndex:kForwardIndex] isEnabled] ? true : false);
     EXPECT_EQ(updater->IsCommandEnabled(IDC_RELOAD),
               [[views objectAtIndex:kReloadIndex] isEnabled] ? true : false);
     EXPECT_EQ(updater->IsCommandEnabled(IDC_HOME),
               [[views objectAtIndex:kHomeIndex] isEnabled] ? true : false);
-    EXPECT_EQ(updater->IsCommandEnabled(IDC_BOOKMARK_PAGE),
-              [[views objectAtIndex:kStarIndex] isEnabled] ? true : false);
   }
 
   BrowserTestHelper helper_;
   scoped_nsobject<ViewResizerPong> resizeDelegate_;
   scoped_nsobject<ToolbarController> bar_;
 };
 
 TEST_VIEW(ToolbarControllerTest, [bar_ view])
 
 // Test the initial state that everything is sync'd up
@@ skipping 60 matching lines @@
 }
 
 // Check that toggling the state of the home button changes the visible
 // state of the home button and moves the other buttons accordingly.
 TEST_F(ToolbarControllerTest, ToggleHome) {
   PrefService* prefs = helper_.profile()->GetPrefs();
   bool showHome = prefs->GetBoolean(prefs::kShowHomeButton);
   NSView* homeButton = [[bar_ toolbarViews] objectAtIndex:kHomeIndex];
   EXPECT_EQ(showHome, ![homeButton isHidden]);
 
-  NSView* starButton = [[bar_ toolbarViews] objectAtIndex:kStarIndex];
+  NSView* reloadButton = [[bar_ toolbarViews] objectAtIndex:kReloadIndex];
   NSView* locationBar = [[bar_ toolbarViews] objectAtIndex:kLocationIndex];
-  NSRect originalStarFrame = [starButton frame];
+  NSRect originalReloadFrame = [reloadButton frame];
   NSRect originalLocationBarFrame = [locationBar frame];
 
   // Toggle the pref and make sure the button changed state and the other
   // views moved.
   prefs->SetBoolean(prefs::kShowHomeButton, !showHome);
   EXPECT_EQ(showHome, [homeButton isHidden]);
-  EXPECT_NE(NSMinX(originalStarFrame), NSMinX([starButton frame]));
+  EXPECT_NE(NSMinX(originalReloadFrame), NSMinX([reloadButton frame]));
   EXPECT_NE(NSMinX(originalLocationBarFrame), NSMinX([locationBar frame]));
   EXPECT_NE(NSWidth(originalLocationBarFrame), NSWidth([locationBar frame]));
 }
 
 TEST_F(ToolbarControllerTest, TogglePageWrench) {
   PrefService* prefs = helper_.profile()->GetPrefs();
   bool showButtons = prefs->GetBoolean(prefs::kShowPageOptionsButtons);
   NSView* pageButton = [[bar_ toolbarViews] objectAtIndex:kPageIndex];
   NSView* wrenchButton = [[bar_ toolbarViews] objectAtIndex:kWrenchIndex];
   EXPECT_EQ(showButtons, ![pageButton isHidden]);
@@ skipping 30 matching lines @@
   EXPECT_EQ([homeButton isHidden], YES);
   NSRect newLocationBarFrame = [locationBar frame];
   EXPECT_TRUE(NSEqualRects(locationBarFrame, newLocationBarFrame));
   [bar_ showOptionalPageWrenchButtons];
   EXPECT_EQ([pageButton isHidden], YES);
   EXPECT_EQ([wrenchButton isHidden], YES);
   newLocationBarFrame = [locationBar frame];
   EXPECT_TRUE(NSEqualRects(locationBarFrame, newLocationBarFrame));
 }
 
-TEST_F(ToolbarControllerTest, StarButtonInWindowCoordinates) {
-  NSRect star = [bar_ starButtonInWindowCoordinates];
+TEST_F(ToolbarControllerTest, StarIconInWindowCoordinates) {
+  NSRect star = [bar_ starIconInWindowCoordinates];
   NSRect all = [[[bar_ view] window] frame];
 
   // Make sure the star is completely inside the window rect
   EXPECT_TRUE(NSContainsRect(all, star));
 }
 
 TEST_F(ToolbarControllerTest, BubblePosition) {
   NSView* locationBar = [[bar_ toolbarViews] objectAtIndex:kLocationIndex];
 
   // The window frame (in window base coordinates).
@@ skipping 34 matching lines @@
   [view setHitTestReturn:button];
   EXPECT_FALSE([bar_ hoverButtonForEvent:event]);
 
   // Now!
   scoped_nsobject<GradientButtonCell> cell([[GradientButtonCell alloc] init]);
   [button setCell:cell.get()];
   EXPECT_TRUE([bar_ hoverButtonForEvent:nil]);
 }
 
 }  // namespace