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

chrome/browser/cocoa/extensions/browser_actions_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 "browser_actions_controller.h"
 
 #include <string>
 
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/cocoa/extensions/browser_action_button.h"
 #include "chrome/browser/cocoa/extensions/browser_actions_container_view.h"
 #include "chrome/browser/cocoa/extensions/extension_popup_controller.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extension_toolbar_model.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 
 // The padding between browser action buttons.
 extern const CGFloat kBrowserActionButtonPadding = 3;
 
+namespace {
+const CGFloat kContainerPadding = 2.0;
+const CGFloat kGrippyXOffset = 8.0;
+}  // namespace
+
 NSString* const kBrowserActionsChangedNotification = @"BrowserActionsChanged";
 
 @interface BrowserActionsController(Private)
 - (void)createActionButtonForExtension:(Extension*)extension
                              withIndex:(int)index;
 - (void)removeActionButtonForExtension:(Extension*)extension;
 - (void)repositionActionButtons;
 - (int)currentTabId;
 - (bool)shouldDisplayBrowserAction:(Extension*)extension;
 @end
@@ skipping 40 matching lines @@
   BrowserActionsController* owner_;
 
   // Used for registering to receive notifications and automatic clean up.
   NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionsServiceObserverBridge);
 };
 
 @implementation BrowserActionsController
 
+@synthesize containerView = containerView_;
+
 - (id)initWithBrowser:(Browser*)browser
         containerView:(BrowserActionsContainerView*)container {
   DCHECK(browser && container);
 
   if ((self = [super init])) {
     browser_ = browser;
     profile_ = browser->profile();
 
     observer_.reset(new ExtensionsServiceObserverBridge(self, profile_));
     ExtensionsService* extensionsService = profile_->GetExtensionsService();
@@ skipping 33 matching lines @@
   if (!toolbarModel_)
     return;
 
   int i = 0;
   for (ExtensionList::iterator iter = toolbarModel_->begin();
        iter != toolbarModel_->end(); ++iter) {
     [self createActionButtonForExtension:*iter withIndex:i++];
   }
 }
 
+- (CGFloat)idealContainerWidth {
+  NSUInteger buttonCount = [self visibleButtonCount];
+  if (buttonCount == 0)
+    return 0.0;
+
+  return kGrippyXOffset + kContainerPadding + (buttonCount *
+      (kBrowserActionWidth + kBrowserActionButtonPadding));
+}
+
 - (void)createActionButtonForExtension:(Extension*)extension
                              withIndex:(int)index {
   if (!extension->browser_action())
     return;
 
   if (![self shouldDisplayBrowserAction:extension])
     return;
 
   // Show the container if it's the first button. Otherwise it will be shown
   // already.
@@ skipping 37 matching lines @@
   } else {
     [self repositionActionButtons];
   }
   [[NSNotificationCenter defaultCenter]
       postNotificationName:kBrowserActionsChangedNotification object:self];
   [containerView_ setNeedsDisplay:YES];
 }
 
 - (void)repositionActionButtons {
   for (NSUInteger i = 0; i < [buttonOrder_ count]; ++i) {
-    CGFloat xOffset = i * (kBrowserActionWidth + kBrowserActionButtonPadding);
+    CGFloat xOffset = kGrippyXOffset +
+        (i * (kBrowserActionWidth + kBrowserActionButtonPadding));
     BrowserActionButton* button = [buttonOrder_ objectAtIndex:i];
     NSRect buttonFrame = [button frame];
     buttonFrame.origin.x = xOffset;
     [button setFrame:buttonFrame];
   }
 }
 
-- (int)buttonCount {
+- (NSUInteger)buttonCount {
   return [buttons_ count];
 }
 
-- (int)visibleButtonCount {
+- (NSUInteger)visibleButtonCount {
   int count = 0;
   for (BrowserActionButton* button in [buttons_ allValues]) {
     if (![button isHidden])
       ++count;
   }
   return count;
 }
 
 - (void)browserActionClicked:(BrowserActionButton*)sender {
   int tabId = [self currentTabId];
@@ skipping 52 matching lines @@
   return [buttonOrder_ objectAtIndex:(NSUInteger)index];
 }
 
 - (bool)shouldDisplayBrowserAction:(Extension*)extension {
   return (!profile_->IsOffTheRecord() ||
           profile_->GetExtensionsService()->
               IsIncognitoEnabled(extension->id()));
 }
 
 @end