Add a bare-bones extension shelf that displays extension items on OS X.

chrome/browser/cocoa/browser_window_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.
 
 #include <Carbon/Carbon.h>
 
 #include "base/mac_util.h"
 #include "base/scoped_nsdisable_screen_updates.h"
 #import "base/scoped_nsobject.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"  // IDC_*
 #include "chrome/browser/bookmarks/bookmark_editor.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/encoding_menu_controller.h"
 #include "chrome/browser/location_bar.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #import "chrome/browser/cocoa/bookmark_bar_controller.h"
 #import "chrome/browser/cocoa/bookmark_editor_controller.h"
 #import "chrome/browser/cocoa/browser_window_cocoa.h"
 #import "chrome/browser/cocoa/browser_window_controller.h"
 #import "chrome/browser/cocoa/download_shelf_controller.h"
+#import "chrome/browser/cocoa/extension_shelf_controller.h"
 #import "chrome/browser/cocoa/find_bar_cocoa_controller.h"
 #include "chrome/browser/cocoa/find_bar_bridge.h"
 #import "chrome/browser/cocoa/fullscreen_window.h"
 #import "chrome/browser/cocoa/infobar_container_controller.h"
 #import "chrome/browser/cocoa/status_bubble_mac.h"
 #import "chrome/browser/cocoa/tab_strip_model_observer_bridge.h"
 #import "chrome/browser/cocoa/tab_strip_view.h"
 #import "chrome/browser/cocoa/tab_strip_controller.h"
 #import "chrome/browser/cocoa/tab_view.h"
 #import "chrome/browser/cocoa/toolbar_controller.h"
@@ skipping 144 matching lines @@
                                      browser:browser
                               resizeDelegate:self
                             bookmarkDelegate:self]);
     // If we are a pop-up, we have a titlebar and no toolbar.
     if (!browser_->SupportsWindowFeature(Browser::FEATURE_TOOLBAR) &&
         browser_->SupportsWindowFeature(Browser::FEATURE_TITLEBAR)) {
       [toolbarController_ setHasToolbar:NO];
     }
     [[[self window] contentView] addSubview:[toolbarController_ view]];
 
+    if (browser_->SupportsWindowFeature(Browser::FEATURE_EXTENSIONSHELF)) {
+      // Create the extension shelf.
+      extensionShelfController_.reset([[ExtensionShelfController alloc]
+                                        initWithBrowser:browser_.get()
+                                         resizeDelegate:self]);
+      [[[self window] contentView] addSubview:[extensionShelfController_ view]];
+      [extensionShelfController_ wasInsertedIntoWindow];
+      [extensionShelfController_ show:nil];
+    }
+
     [self fixWindowGradient];
 
     // Force a relayout of all the various bars.
     [self layoutSubviews];
 
     // Create the bridge for the status bubble.
     statusBubble_.reset(new StatusBubbleMac([self window], self));
 
 #if 0
     // Move all buttons down two pixels for visual balance.
@@ skipping 257 matching lines @@
 
   // If it wasn't reasonable, return NO.
   return NO;
 }
 
 // Main method to resize browser window subviews.  This method should be called
 // when resizing any child of the content view, rather than resizing the views
 // directly.  If the view is already the correct height, does not force a
 // relayout.
 - (void)resizeView:(NSView*)view newHeight:(float)height {
-  // We should only ever be called for one of the following three views.
+  // We should only ever be called for one of the following four views.
   // |downloadShelfController_| may be nil.
   DCHECK(view);
   DCHECK(view == [toolbarController_ view] ||
          view == [infoBarContainerController_ view] ||
-         view == [downloadShelfController_ view]);
+         view == [downloadShelfController_ view] ||
+         view == [extensionShelfController_ view]);
 
   // Change the height of the view and call layoutViews.  We set the height here
   // without regard to where the view is on the screen or whether it needs to
   // "grow up" or "grow down."  The below call to layoutSubviews will position
   // each view correctly.
   NSRect frame = [view frame];
   if (frame.size.height == height)
     return;
 
   frame.size.height = height;
@@ skipping 123 matching lines @@
 // Called when another part of the internal codebase needs to execute a
 // command.
 - (void)executeCommand:(int)command {
   if (browser_->command_updater()->IsCommandEnabled(command))
     browser_->ExecuteCommand(command);
 }
 
 // StatusBubble delegate method: tell the status bubble how far above the bottom
 // of the window it should position itself.
 - (float)verticalOffsetForStatusBubble {
-  float offset = 0.0;
-
-  // Don't create a download shelf if there isn't one.
-  if (downloadShelfController_.get() && [[self downloadShelf] isVisible])
-    offset += [[self downloadShelf] height];
-
-  return offset;
+  return verticalOffsetForStatusBubble_;
 }
 
 - (GTMWindowSheetController*)sheetController {
   return [tabStripController_ sheetController];
 }
 
 - (LocationBar*)locationBar {
   return [toolbarController_ locationBar];
 }
 
@@ skipping 185 matching lines @@
 - (BOOL)isTabFullyVisible:(TabView*)tab {
   return [tabStripController_ isTabFullyVisible:tab];
 }
 
 - (void)showNewTabButton:(BOOL)show {
   [tabStripController_ showNewTabButton:show];
 }
 
 - (BOOL)isBookmarkBarVisible {
   return [[toolbarController_ bookmarkBarController] isBookmarkBarVisible];
-
 }
 
 - (void)toggleBookmarkBar {
   BookmarkBarController* bar = [toolbarController_ bookmarkBarController];
   [bar toggleBookmarkBar];
 }
 
 - (BOOL)isDownloadShelfVisible {
   return downloadShelfController_ != nil &&
       [downloadShelfController_ isVisible];
@@ skipping 394 matching lines @@
   [toolbarView setFrame:toolbarFrame];
 
   // Place the infobar container in place below the toolbar.
   NSView* infoBarView = [infoBarContainerController_ view];
   NSRect infoBarFrame = [infoBarView frame];
   infoBarFrame.origin.y = maxY - NSHeight(infoBarFrame);
   infoBarFrame.size.width = NSWidth(contentFrame);
   [infoBarView setFrame:infoBarFrame];
   maxY -= NSHeight(infoBarFrame);
 
-  // Place the download shelf at the bottom of the view, if it exists.
+  // Place the extension shelf at the bottom of the view, if it exists.
+  if (extensionShelfController_.get()) {
+    NSView* extensionView = [extensionShelfController_ view];
+    NSRect extensionFrame = [extensionView frame];
+    extensionFrame.origin.y = minY;
+    extensionFrame.size.width = NSWidth(contentFrame);
+    [extensionView setFrame:extensionFrame];
+    minY += NSHeight(extensionFrame);
+  }
+
+  // Place the download shelf above the extension shelf, if it exists.
   if (downloadShelfController_.get()) {
     NSView* downloadView = [downloadShelfController_ view];
     NSRect downloadFrame = [downloadView frame];
     downloadFrame.origin.y = minY;
     downloadFrame.size.width = NSWidth(contentFrame);
     [downloadView setFrame:downloadFrame];
     minY += NSHeight(downloadFrame);
   }
 
   // Finally, the tabContentArea takes up all of the remaining space.
   NSView* tabContentView = [self tabContentArea];
   NSRect tabContentFrame = [tabContentView frame];
   tabContentFrame.origin.y = minY;
   tabContentFrame.size.height = maxY - minY;
   tabContentFrame.size.width = NSWidth(contentFrame);
   [tabContentView setFrame:tabContentFrame];
 
   // Position the find bar relative to the infobar container.
   [findBarCocoaController_
     positionFindBarView:[infoBarContainerController_ view]];
+
+  verticalOffsetForStatusBubble_ = minY;
 }
 
 @end
 
 @implementation GTMTheme (BrowserThemeProviderInitialization)
 + (GTMTheme *)themeWithBrowserThemeProvider:(BrowserThemeProvider*)provider
                              isOffTheRecord:(BOOL)isOffTheRecord {
   // First check if it's in the cache.
   // TODO(pinkerton): This might be a good candidate for a singleton.
   typedef std::pair<std::string, BOOL> ThemeKey;
@@ skipping 116 matching lines @@
       provider->GetNSColor(BrowserThemeProvider::COLOR_TOOLBAR);
   [theme setValue:toolbarBackgroundColor
      forAttribute:@"backgroundColor"
             style:GTMThemeStyleToolBar
             state:GTMThemeStateActiveWindow];
 
   return theme;
 }
 @end