[Mac] Adds grippys to the left side of the Browser Actions container to resiz...

chrome/browser/cocoa/toolbar_controller.mm

 // Copyright (c) 2010 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/cocoa/toolbar_controller.h"
 
 #include <algorithm>
 
 #include "app/l10n_util_mac.h"
 #include "base/mac_util.h"
 #include "base/nsimage_cache_mac.h"
 #include "base/sys_string_conversions.h"
 #include "base/gfx/rect.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/app_menu_model.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/bubble_positioner.h"
 #import "chrome/browser/cocoa/autocomplete_text_field.h"
 #import "chrome/browser/cocoa/autocomplete_text_field_editor.h"
 #import "chrome/browser/cocoa/back_forward_menu_controller.h"
 #import "chrome/browser/cocoa/background_gradient_view.h"
 #import "chrome/browser/cocoa/encoding_menu_controller_delegate_mac.h"
 #import "chrome/browser/cocoa/extensions/browser_action_button.h"
+#import "chrome/browser/cocoa/extensions/browser_actions_container_view.h"
 #import "chrome/browser/cocoa/extensions/browser_actions_controller.h"
 #import "chrome/browser/cocoa/gradient_button_cell.h"
 #import "chrome/browser/cocoa/location_bar_view_mac.h"
 #import "chrome/browser/cocoa/menu_button.h"
 #import "chrome/browser/cocoa/menu_controller.h"
 #import "chrome/browser/cocoa/toolbar_view.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/page_menu_model.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/search_engines/template_url_model.h"
@@ skipping 180 matching lines @@
                                                 bubblePositioner_.get(),
                                                 commands_, toolbarModel_,
                                                 profile_, browser_));
   [locationBar_ setFont:[NSFont systemFontOfSize:[NSFont systemFontSize]]];
   [[NSNotificationCenter defaultCenter]
       addObserver:self
          selector:@selector(windowResized)
              name:NSWindowDidResizeNotification
            object:[[self view] window]];
   // Register pref observers for the optional home and page/options buttons
-  // and then add them to the toolbar them based on those prefs.
+  // and then add them to the toolbar based on those prefs.
   prefObserver_.reset(new ToolbarControllerInternal::PrefObserverBridge(self));
   PrefService* prefs = profile_->GetPrefs();
   showHomeButton_.Init(prefs::kShowHomeButton, prefs, prefObserver_.get());
   showPageOptionButtons_.Init(prefs::kShowPageOptionsButtons, prefs,
                               prefObserver_.get());
   [self showOptionalHomeButton];
   [self showOptionalPageWrenchButtons];
 
   // Create the controllers for the back/forward menus.
   backMenuController_.reset([[BackForwardMenuController alloc]
@@ skipping 333 matching lines @@
     return;  // Nothing to do, view state matches pref state.
 
   // Shift the go button and resize the text field by the width of the
   // page/wrench buttons plus two times the gap width. If we're showing the
   // buttons, we have to reverse the direction of movement (to the left). Unlike
   // the home button above, we only ever have to resize the text field, we don't
   // have to move it.
   CGFloat moveX = 2 * [self interButtonSpacing] + NSWidth([pageButton_ frame]) +
       NSWidth([wrenchButton_ frame]);
 
-  // Adjust for the extra unit of inter-button spacing added when the page and
-  // wrench buttons are hidden.
-  if ([browserActionsController_ visibleButtonCount] > 0)
-    moveX -= [self interButtonSpacing];
-
   if (!hide)
     moveX *= -1;  // Reverse the direction of the move.
 
   [self adjustLocationAndGoPositionsBy:moveX];
   [browserActionsContainerView_ setFrame:NSOffsetRect(
       [browserActionsContainerView_ frame], moveX, 0)];
 
+  [browserActionsContainerView_ setRightBorderShown:!hide];
   [pageButton_ setHidden:hide];
   [wrenchButton_ setHidden:hide];
 }
 
 - (void)prefChanged:(std::wstring*)prefName {
   if (!prefName) return;
   if (*prefName == prefs::kShowHomeButton) {
     [self showOptionalHomeButton];
   } else if (*prefName == prefs::kShowPageOptionsButtons) {
     [self showOptionalPageWrenchButtons];
   }
 }
 
 - (void)createBrowserActionButtons {
   [browserActionsController_ createButtons];
   [self showOrHideBrowserActionButtons];
+  BOOL rightBorderShown = !([pageButton_ isHidden] && [wrenchButton_ isHidden]);
+  [browserActionsContainerView_ setRightBorderShown:rightBorderShown];
 }
 
 - (void)showOrHideBrowserActionButtons {
   // TODO(andybons): This is ugly as sin and hard to follow. Fix it up.
 
   int buttonCount = [browserActionsController_ buttonCount];
   if (buttonCount == 0 || !hasToolbar_)
     return;
 
   CGFloat curWidth = NSWidth([[[self view] window] frame]);
@@ skipping 30 matching lines @@
       return;
     BrowserActionButton* button = [[browserActionsContainerView_ subviews]
         objectAtIndex:visibleCount + arrayOffset];
     [button setHidden:hide];
     [self browserActionsChanged];
     --delta;
   }
 }
 
 - (void)browserActionsChanged {
-  // Calculate the new width.
-  int buttonCount = [browserActionsController_ visibleButtonCount];
-
-  CGFloat width = 0.0;
-  if (buttonCount > 0)
-    width = buttonCount * (kBrowserActionWidth + kBrowserActionButtonPadding);
-
+  CGFloat width = [browserActionsController_ idealContainerWidth];
   NSRect containerFrame = [browserActionsContainerView_ frame];
-  CGFloat buttonSpacing = [self interButtonSpacing];
   CGFloat dX = containerFrame.size.width - width;
   containerFrame.size.width = width;
 
-  bool addingButton = (dX < 0);
-  // If a button is being added, add spacing inward by negating the value.
-  if (addingButton)
-    buttonSpacing *= -1;
-
-  // If the first button is being added or the last button is being removed,
-  // then account for the right padding it will need.
-  if ((buttonCount == 1 && addingButton) ||
-      (buttonCount == 0 && !addingButton)) {
-    dX += buttonSpacing;
-    // The offset of the buttons from the right side will be one button spacing
-    // unit more than if the wrench and page buttons were shown.
-    if ([pageButton_ isHidden] && [wrenchButton_ isHidden]) {
-      dX += buttonSpacing;
-    }
-  }
-
   [browserActionsContainerView_ setFrame:NSOffsetRect(containerFrame, dX, 0)];
   [self adjustLocationAndGoPositionsBy:dX];
 }
 
 - (void)adjustLocationAndGoPositionsBy:(CGFloat)dX {
   [goButton_ setFrame:NSOffsetRect([goButton_ frame], dX, 0)];
   NSRect locationFrame = [locationBar_ frame];
   locationFrame.size.width += dX;
   [locationBar_ setFrame:locationFrame];
 }
@@ skipping 126 matching lines @@
 - (void)indicateDropURLsInView:(NSView*)view at:(NSPoint)point {
   // Do nothing.
 }
 
 // (URLDropTargetController protocol)
 - (void)hideDropURLsIndicatorInView:(NSView*)view {
   // Do nothing.
 }
 
 @end