Initial change for the implementation of browser actions on the mac....

chrome/browser/cocoa/toolbar_controller.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 "chrome/browser/cocoa/toolbar_controller.h"
 
 #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/autocomplete/autocomplete_edit_view.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/encoding_menu_controller_delegate_mac.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"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/toolbar_model.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
@@ skipping 14 matching lines @@
 
 // Height of the toolbar in pixels when the bookmark bar is closed.
 static const float kBaseToolbarHeight = 36.0;
 
 // Overlap (in pixels) between the toolbar and the bookmark bar.
 static const float kBookmarkBarOverlap = 6.0;
 
 @interface ToolbarController(Private)
 - (void)initCommandStatus:(CommandUpdater*)commands;
 - (void)prefChanged:(std::wstring*)prefName;
+- (void)browserActionsChanged;
+- (void)adjustLocationAndGoPositionsBy:(CGFloat)dX;
 @end
 
 namespace {
 
 // A C++ class used to correctly position the omnibox.
 class BubblePositionerMac : public BubblePositioner {
  public:
   BubblePositionerMac(ToolbarController* controller)
       : controller_(controller) { }
   virtual ~BubblePositionerMac() { }
@@ skipping 56 matching lines @@
     commandObserver_->ObserveCommand(IDC_BOOKMARK_PAGE);
   }
   return self;
 }
 
 - (void)dealloc {
   // Make sure any code in the base class which assumes [self view] is
   // the "parent" view continues to work.
   hasToolbar_ = YES;
 
+  [[NSNotificationCenter defaultCenter] removeObserver:self];
+
   if (trackingArea_.get())
     [[self view] removeTrackingArea:trackingArea_.get()];
   [super dealloc];
 }
 
 // Called after the view is done loading and the outlets have been hooked up.
 // Now we can hook up bridges that rely on UI objects such as the location
 // bar and button state.
 - (void)awakeFromNib {
   // A bug in AppKit (<rdar://7298597>, <http://openradar.me/7298597>) causes
@@ skipping 32 matching lines @@
 
   // Create the controllers for the back/forward menus.
   backMenuController_.reset([[BackForwardMenuController alloc]
           initWithBrowser:browser_
                 modelType:BACK_FORWARD_MENU_TYPE_BACK
                    button:backButton_]);
   forwardMenuController_.reset([[BackForwardMenuController alloc]
           initWithBrowser:browser_
                 modelType:BACK_FORWARD_MENU_TYPE_FORWARD
                    button:forwardButton_]);
-
+  browserActionsController_.reset([[BrowserActionsController alloc]
+          initWithBrowser:browser_
+            containerView:browserActionContainerView_]);
+  // When new browser actions are added/removed, the container view for them is
+  // resized, necessitating the probable resizing of surrounding elements
+  // handled by this controller.
+  [[NSNotificationCenter defaultCenter]
+      addObserver:self
+         selector:@selector(browserActionsChanged)
+             name:kBrowserActionsChangedNotification
+           object:browserActionsController_];
+  [browserActionsController_ createButtons];
   // For a popup window, the toolbar is really just a location bar
   // (see override for [ToolbarController view], below).  When going
   // fullscreen, we remove the toolbar controller's view from the view
   // hierarchy.  Calling [locationBar_ removeFromSuperview] when going
   // fullscreen causes it to get released, making us unhappy
   // (http://crbug.com/18551).  We avoid the problem by incrementing
   // the retain count of the location bar; use of the scoped object
   // helps us remember to release it.
   locationBarRetainer_.reset([locationBar_ retain]);
   trackingArea_.reset(
@@ skipping 163 matching lines @@
     [autocompleteTextFieldEditor_.get() setFieldEditor:YES];
     return autocompleteTextFieldEditor_.get();
   }
   return nil;
 }
 
 // Returns an array of views in the order of the outlets above.
 - (NSArray*)toolbarViews {
   return [NSArray arrayWithObjects:backButton_, forwardButton_, reloadButton_,
             homeButton_, starButton_, goButton_, pageButton_, wrenchButton_,
-            locationBar_, encodingMenu_, nil];
+            locationBar_, encodingMenu_, browserActionContainerView_, nil];
 }
 
 // Moves |rect| to the right by |delta|, keeping the right side fixed by
 // shrinking the width to compensate. Passing a negative value for |deltaX|
 // moves to the left and increases the width.
-- (NSRect)adjustRect:(NSRect)rect byAmount:(float)deltaX {
+- (NSRect)adjustRect:(NSRect)rect byAmount:(CGFloat)deltaX {
   NSRect frame = NSOffsetRect(rect, deltaX, 0);
   frame.size.width -= deltaX;
   return frame;
 }
 
 // Computes the padding between the buttons that should have a separation from
 // the positions in the nib. Since the forward and reload buttons are always
 // visible, we use those buttons as the canonical spacing.
-- (float)interButtonSpacing {
+- (CGFloat)interButtonSpacing {
   NSRect forwardFrame = [forwardButton_ frame];
   NSRect reloadFrame = [reloadButton_ frame];
   DCHECK(NSMinX(reloadFrame) > NSMaxX(forwardFrame));
   return NSMinX(reloadFrame) - NSMaxX(forwardFrame);
 }
 
 // Show or hide the home button based on the pref.
 - (void)showOptionalHomeButton {
   // Ignore this message if only showing the URL bar.
   if (!hasToolbar_)
     return;
   BOOL hide = showHomeButton_.GetValue() ? NO : YES;
   if (hide == [homeButton_ isHidden])
     return;  // Nothing to do, view state matches pref state.
 
   // Always shift the star and text field by the width of the home button plus
   // the appropriate gap width. If we're hiding the button, we have to
   // reverse the direction of the movement (to the left).
-  float moveX = [self interButtonSpacing] + [homeButton_ frame].size.width;
+  CGFloat moveX = [self interButtonSpacing] + [homeButton_ frame].size.width;
   if (hide)
     moveX *= -1;  // Reverse the direction of the move.
 
   [starButton_ setFrame:NSOffsetRect([starButton_ frame], moveX, 0)];
   [locationBar_ setFrame:[self adjustRect:[locationBar_ frame]
                                  byAmount:moveX]];
   [homeButton_ setHidden:hide];
 }
 
 // Show or hide the page and wrench buttons based on the pref.
 - (void)showOptionalPageWrenchButtons {
   // Ignore this message if only showing the URL bar.
   if (!hasToolbar_)
     return;
   DCHECK([pageButton_ isHidden] == [wrenchButton_ isHidden]);
   BOOL hide = showPageOptionButtons_.GetValue() ? NO : YES;
   if (hide == [pageButton_ isHidden])
     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.
-  float moveX = 2 * [self interButtonSpacing] + NSWidth([pageButton_ frame]) +
-                  NSWidth([wrenchButton_ frame]);
+  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_ buttonCount] > 0)
+    moveX -= [self interButtonSpacing];
+
   if (!hide)
     moveX *= -1;  // Reverse the direction of the move.
-  [goButton_ setFrame:NSOffsetRect([goButton_ frame], moveX, 0)];
-  NSRect locationFrame = [locationBar_ frame];
-  locationFrame.size.width += moveX;
-  [locationBar_ setFrame:locationFrame];
+
+  [self adjustLocationAndGoPositionsBy:moveX];
+  [browserActionContainerView_ setFrame:NSOffsetRect(
+      [browserActionContainerView_ frame], moveX, 0)];
 
   [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)browserActionsChanged {
+  // Calculate the new width.
+  int buttonCount = [browserActionsController_ buttonCount];
+
+  CGFloat width = 0.0;
+  if (buttonCount > 0) {
+    width = (buttonCount *
+        (kBrowserActionWidth + kBrowserActionButtonPadding)) -
+            kBrowserActionButtonPadding;  // No padding after last button.
+  }
+
+  NSRect containerFrame = [browserActionContainerView_ 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;
+    }
+  }
+
+  [browserActionContainerView_ 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];
+}
+
 - (NSRect)starButtonInWindowCoordinates {
   return [[[starButton_ window] contentView] convertRect:[starButton_ bounds]
                                                 fromView:starButton_];
 }
 
 - (void)setShouldBeCompressed:(BOOL)compressed {
   CGFloat newToolbarHeight = kBaseToolbarHeight;
   if (compressed)
     newToolbarHeight -= kBookmarkBarOverlap;
 
@@ skipping 68 matching lines @@
 
   NSRect r = NSMakeRect(minX, NSMinY(locationFrame), maxX - minX,
                         NSHeight(locationFrame));
   gfx::Rect stack_bounds(
       NSRectToCGRect([[self view] convertRect:r toView:nil]));
   // Inset the bounds to just inside the visible edges (see comment above).
   stack_bounds.Inset(kLocationStackEdgeWidth, 0);
   return stack_bounds;
 }
 @end