Merge 41114 - [Mac] More progress towards resizing the Browser Actions contai...

chrome/browser/cocoa/extension_installed_bubble_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 "extension_installed_bubble_controller.h"
 
 #include "app/l10n_util.h"
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/browser.h"
@@ skipping 156 matching lines @@
 
   switch(type_) {
     case extension_installed_bubble::kBrowserAction: {
       // Find the center of the bottom of the browser action icon.
       NSView* button = [[[window->cocoa_controller() toolbarController]
           browserActionsController] browserActionViewForExtension:extension_];
       DCHECK(button);
       NSRect boundsRect = [[[button window] contentView]
           convertRect:[button frame]
              fromView:[button superview]];
-      arrowPoint =
-          NSMakePoint(NSMinX(boundsRect) + NSWidth([button frame]) / 2,
-                      NSMinY(boundsRect));
+      CGFloat xPos = NSMinX(boundsRect) + NSWidth([button frame]) / 2;
+      // If the button is hidden, display the button at the edge of the Browser
+      // Actions container.
+      // TODO(andybons): Make it point to the chevron once it's implemented.
+      if ([button alphaValue] == 0.0)
+        xPos = NSMaxX([[button superview] frame]);
+
+      arrowPoint = NSMakePoint(xPos, NSMinY(boundsRect));
       break;
     }
     case extension_installed_bubble::kPageAction: {
       LocationBarViewMac* locationBarView =
           static_cast<LocationBarViewMac*>(
               [[window->cocoa_controller() toolbarController]
                locationBarBridge]);
       // Tell the location bar to show a preview of the page action icon, which
       // would ordinarily only be displayed on a page of the appropriate type.
       // We remove this preview when the extension installed bubble closes.
@@ skipping 146 matching lines @@
 
 - (NSRect)getPageActionInfoMsgFrame {
   return [pageActionInfoMsg_ frame];
 }
 
 - (NSRect)getExtensionInstalledInfoMsgFrame {
   return [extensionInstalledInfoMsg_ frame];
 }
 
 @end