Remove wrench button from panel.

chrome/browser/ui/panels/panel_titlebar_view_cocoa.mm

 // Copyright (c) 2012 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/ui/panels/panel_titlebar_view_cocoa.h"
 
 #include <Carbon/Carbon.h>  // kVK_Escape
 #import <Cocoa/Cocoa.h>
 
 #include "base/logging.h"
@@ skipping 105 matching lines @@
     [self removeTrackingArea:closeButtonTrackingArea_.get()];
   [[NSNotificationCenter defaultCenter] removeObserver:self];
   [self stopGlintAnimation];
   [super dealloc];
 }
 
 - (void)onCloseButtonClick:(id)sender {
   [controller_ closePanel];
 }
 
-- (void)onSettingsButtonClick:(id)sender {
-  [controller_ runSettingsMenu:settingsButton_];
-}
-
 - (void)drawRect:(NSRect)rect {
   ThemeService* theme =
       static_cast<ThemeService*>([[self window] themeProvider]);
 
   [title_ setAlphaValue:1.0];
   [icon_ setAlphaValue:1.0];
 
   NSColor* strokeColor = nil;
   NSColor* titleColor = nil;
 
@@ skipping 130 matching lines @@
                  NSMaxY(contentFrame),
                  NSWidth(contentFrame),
                  NSMaxY(rootViewBounds) - NSMaxY(contentFrame));
   [self setFrame:titlebarFrame];
 
   [title_ setWantsLayer:YES];
   [title_ setFont:[NSFont boldSystemFontOfSize:[NSFont systemFontSize]]];
   // This draws nice tight shadow, 'sinking' text into the background.
   [[title_ cell] setBackgroundStyle:NSBackgroundStyleRaised];
 
-  // Initialize the settings button.
-  NSImage* image = gfx::GetCachedImageWithName(@"balloon_wrench.pdf");
-  [settingsButton_ setDefaultImage:image];
-  [settingsButton_ setDefaultOpacity:0.6];
-  [settingsButton_ setHoverImage:image];
-  [settingsButton_ setHoverOpacity:0.9];
-  [settingsButton_ setPressedImage:image];
-  [settingsButton_ setPressedOpacity:1.0];
-  [[settingsButton_ cell] setHighlightsBy:NSNoCellMask];
-  [self checkMouseAndUpdateSettingsButtonVisibility];
-  [self updateWrenchLayout];
-
   [self updateCloseButtonLayout];
 
   // Set autoresizing behavior: glued to edges on left, top and right.
   [self setAutoresizingMask:(NSViewMinYMargin | NSViewWidthSizable)];
 
   [[NSNotificationCenter defaultCenter]
       addObserver:self
          selector:@selector(didChangeTheme:)
              name:kBrowserThemeDidChangeNotification
            object:nil];
@@ skipping 26 matching lines @@
     [self addSubview:icon_ positioned:NSWindowBelow relativeTo:overlay_];
     [icon_ setWantsLayer:YES];
   }
   [self updateIconAndTitleLayout];
 }
 
 - (NSView*)icon {
   return icon_;
 }
 
-- (void)updateWrenchLayout {
-  NSRect bounds = [self bounds];
-  NSRect settingsButtonFrame = [settingsButtonWrapper_ frame];
-  settingsButtonFrame.origin.x = NSWidth(bounds) - NSWidth(settingsButtonFrame);
-  settingsButtonFrame.origin.y =
-      (NSHeight(bounds) - NSHeight(settingsButtonFrame)) / 2;
-  [settingsButtonWrapper_ setFrame:settingsButtonFrame];
-}
-
 - (void)updateCloseButtonLayout {
   NSRect buttonFrame = [closeButton_ frame];
   NSRect bounds = [self bounds];
 
   buttonFrame.origin.x = kButtonPadding;
   // Lower Close Button's frame 1 px to avoid it 'peeking' in MINIMIZED mode.
   buttonFrame.origin.y = (NSHeight(bounds) - NSHeight(buttonFrame)) / 2 - 1;
   [closeButton_ setFrame:buttonFrame];
   if (!closeButtonTrackingArea_.get()) {
     closeButtonTrackingArea_.reset(
         [[CrTrackingArea alloc] initWithRect:[closeButton_ bounds]
                                      options:(NSTrackingMouseEnteredAndExited |
                                               NSTrackingActiveAlways)
                                 proxiedOwner:self
                                     userInfo:nil]);
     NSWindow* panelWindow = [self window];
     [closeButtonTrackingArea_.get() clearOwnerWhenWindowWillClose:panelWindow];
     [closeButton_ addTrackingArea:closeButtonTrackingArea_.get()];
   }
 }
 
 - (void)updateIconAndTitleLayout {
   NSRect closeButtonFrame = [closeButton_ frame];
   NSRect iconFrame = [icon_ frame];
   // NSTextField for title_ is set to Layout:Truncate, LineBreaks:TruncateTail
   // in Interface Builder so it is sized in a single-line mode.
   [title_ sizeToFit];
   NSRect titleFrame = [title_ frame];
-  NSRect settingsButtonFrame = [settingsButtonWrapper_ frame];
   NSRect bounds = [self bounds];
 
   // Place the icon and title at the center of the titlebar.
   int iconWidthWithPadding = NSWidth(iconFrame) + kIconAndTextPadding;
   int titleWidth = NSWidth(titleFrame);
   int availableWidth = NSWidth(bounds) - kButtonPadding * 4 -

[Dmitry Titov, 2012/04/16 19:45:05]

this should go from 4 to 2 since there are no paddings around.

[jianli, 2012/04/16 23:24:45]

Done.

-      NSWidth(closeButtonFrame) - NSWidth(settingsButtonFrame);
+      NSWidth(closeButtonFrame);
   if (iconWidthWithPadding + titleWidth > availableWidth)
     titleWidth = availableWidth - iconWidthWithPadding;
   int startX = kButtonPadding * 2 + NSWidth(closeButtonFrame) +
       (availableWidth - iconWidthWithPadding - titleWidth) / 2;
 
   iconFrame.origin.x = startX;
   iconFrame.origin.y = (NSHeight(bounds) - NSHeight(iconFrame)) / 2;
   [icon_ setFrame:iconFrame];
 
   titleFrame.origin.x = startX + iconWidthWithPadding;
@@ skipping 15 matching lines @@
 
 - (void)mouseEntered:(NSEvent*)event {
   [[closeButton_ cell] setHighlighted:YES];
 }
 
 - (void)mouseExited:(NSEvent*)event {
   [[closeButton_ cell] setHighlighted:NO];
 }
 
 - (void)didChangeFrame:(NSNotification*)notification {
-  [self updateWrenchLayout];
   [self updateIconAndTitleLayout];
 }
 
 - (void)didChangeTheme:(NSNotification*)notification {
   [self setNeedsDisplay:YES];
 }
 
 - (void)didChangeMainWindow:(NSNotification*)notification {
   [self setNeedsDisplay:YES];
-  [self checkMouseAndUpdateSettingsButtonVisibility];
 }
 
 - (void)mouseDown:(NSEvent*)event {
   if ([controller_ isDraggable]) {
     dragState_ = PANEL_DRAG_CAN_START;
     NSWindow* window = [self window];
     NSPoint mouseLocationInWindow = [event locationInWindow];
     dragStartLocation_ = [window convertBaseToScreen:mouseLocationInWindow];
     dragStartYOffset_ = NSMaxY([window frame]) - dragStartLocation_.y;
   }
@@ skipping 219 matching lines @@
 }
 
 - (void)cancelDragTitlebar {
   [self endDrag:YES];
 }
 
 - (void)finishDragTitlebar {
   [self endDrag:NO];
 }
 
-- (void)updateSettingsButtonVisibility:(BOOL)mouseOverWindow {
-  // The settings button is visible if the panel is main window or the mouse is
-  // over it.
-  BOOL shouldShowSettingsButton =
-      mouseOverWindow || [[self window] isMainWindow];
-  [[settingsButtonWrapper_ animator]
-      setAlphaValue:shouldShowSettingsButton ? 1.0 : 0.0];
-}
-
-- (void)checkMouseAndUpdateSettingsButtonVisibility {
-  BOOL mouseOverWindow = NSPointInRect([NSEvent mouseLocation],
-                                       [[self window] frame]);
-  [self updateSettingsButtonVisibility:mouseOverWindow];
-}
-
 @end