[Mac] Finish implementation of App Tabs.

chrome/browser/cocoa/tab_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.
 
 #include "app/l10n_util_mac.h"
 #include "base/mac_util.h"
 #import "chrome/browser/browser_theme_provider.h"
 #import "chrome/browser/cocoa/menu_controller.h"
 #import "chrome/browser/cocoa/tab_controller.h"
 #import "chrome/browser/cocoa/tab_controller_target.h"
 #import "chrome/browser/cocoa/tab_view.h"
 #import "chrome/browser/cocoa/themed_window.h"
 #import "chrome/common/extensions/extension.h"
 #include "grit/generated_resources.h"
 
 @implementation TabController
 
 @synthesize action = action_;
 @synthesize app = app_;
 @synthesize loadingState = loadingState_;
 @synthesize mini = mini_;
 @synthesize phantom = phantom_;
 @synthesize pinned = pinned_;
 @synthesize target = target_;
 
-namespace {
-const CGFloat kAppIconTopOffsetPx = 2.0;
-}  // anonymous namespace
-
 namespace TabControllerInternal {
 
 // A C++ delegate that handles enabling/disabling menu items and handling when
 // a menu command is chosen. Also fixes up the menu item label for "pin/unpin
 // tab".
 class MenuDelegate : public menus::SimpleMenuModel::Delegate {
  public:
   explicit MenuDelegate(id<TabControllerTarget> target, TabController* owner)
       : target_(target),
         owner_(owner) {}
@@ skipping 21 matching lines @@
 
 }  // TabControllerInternal namespace
 
 // The min widths match the windows values and are sums of left + right
 // padding, of which we have no comparable constants (we draw using paths, not
 // images). The selected tab width includes the close button width.
 + (CGFloat)minTabWidth { return 31; }
 + (CGFloat)minSelectedTabWidth { return 46; }
 + (CGFloat)maxTabWidth { return 220; }
 + (CGFloat)miniTabWidth { return 53; }
-+ (CGFloat)appTabWidth { return 46; }
++ (CGFloat)appTabWidth { return 66; }
 
 - (TabView*)tabView {
   return static_cast<TabView*>([self view]);
 }
 
 - (id)init {
   self = [super initWithNibName:@"TabView" bundle:mac_util::MainAppBundle()];
   if (self != nil) {
     isIconShowing_ = YES;
     NSNotificationCenter* defaultCenter = [NSNotificationCenter defaultCenter];
@@ skipping 45 matching lines @@
   [self internalSetSelected:selected_];
 }
 
 // Called when Cocoa wants to display the context menu. Lazily instantiate
 // the menu based off of the cross-platform model. Re-create the menu and
 // model every time to get the correct labels and enabling.
 - (NSMenu*)menu {
   contextMenuDelegate_.reset(
       new TabControllerInternal::MenuDelegate(target_, self));
   contextMenuModel_.reset(new TabMenuModel(contextMenuDelegate_.get(),
-                                           [self pinned], false, true));
+                                           [self pinned],
+                                           false,  // allow_toolbar_toggle

[Mark Mentovai, 2010/07/14 18:40:28]

OCD: line up the comments.

+                                           true));  // is_toolbar_visible
+
   contextMenuController_.reset(
       [[MenuController alloc] initWithModel:contextMenuModel_.get()
                      useWithPopUpButtonCell:NO]);
   return [contextMenuController_ menu];
 }
 
 - (IBAction)closeTab:(id)sender {
   if ([[self target] respondsToSelector:@selector(closeTab:)]) {
     [[self target] performSelector:@selector(closeTab:)
                         withObject:[self view]];
@@ skipping 18 matching lines @@
 - (BOOL)selected {
   return selected_;
 }
 
 - (void)setIconView:(NSView*)iconView {
   [iconView_ removeFromSuperview];
   iconView_ = iconView;
   if ([self app]) {
     NSRect appIconFrame = [iconView frame];
     appIconFrame.origin = originalIconFrame_.origin;
-    // Adjust the position to prevent clipping due to the icon's larger size.
-    appIconFrame.origin.y -= kAppIconTopOffsetPx;
     // Center the icon.
     appIconFrame.origin.x = ([TabController appTabWidth] -
         NSWidth(appIconFrame)) / 2.0;
     [iconView setFrame:appIconFrame];
   } else {
     [iconView_ setFrame:originalIconFrame_];
   }
   // Ensure that the icon is suppressed if no icon is set or if the tab is too
   // narrow to display one.
   [self updateVisibility];
@@ skipping 123 matching lines @@
 // Called by the tabs to determine whether we are in rapid (tab) closure mode.
 - (BOOL)inRapidClosureMode {
   if ([[self target] respondsToSelector:@selector(inRapidClosureMode)]) {
     return [[self target] performSelector:@selector(inRapidClosureMode)] ?
         YES : NO;
   }
   return NO;
 }
 
 @end