Reverting 24700.

chrome/browser/cocoa/toolbar_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.
 
 #import "chrome/browser/cocoa/toolbar_controller.h"
 
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/gfx/rect.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_view.h"
 #import "chrome/browser/cocoa/autocomplete_text_field.h"
 #import "chrome/browser/cocoa/autocomplete_text_field_editor.h"
 #import "chrome/browser/cocoa/back_forward_menu_controller.h"
 #import "chrome/browser/cocoa/gradient_button_cell.h"
 #import "chrome/browser/cocoa/location_bar_view_mac.h"
 #include "chrome/browser/cocoa/nsimage_cache.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/toolbar_model.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 
 // Name of image in the bundle for the yellow of the star icon.
 static NSString* const kStarredImageName = @"starred.pdf";
 
 // Height of the toolbar in pixels when the bookmark bar is closed.
-static const float kBaseToolbarHeight = 36.0;
+static const float kBaseToolbarHeight = 39.0;
 
 // Overlap (in pixels) between the toolbar and the bookmark bar.
-static const float kBookmarkBarOverlap = 7.0;
+static const float kBookmarkBarOverlap = 5.0;
 
 @interface ToolbarController(Private)
 - (void)initCommandStatus:(CommandUpdater*)commands;
 - (void)prefChanged:(std::wstring*)prefName;
 @end
 
 namespace {
 
 // A C++ class used to correctly position the autocomplete popup.
 class AutocompletePopupPositionerMac : public AutocompletePopupPositioner {
@@ skipping 62 matching lines @@
     commandObserver_->ObserveCommand(IDC_STAR);
   }
   return self;
 }
 
 - (void)dealloc {
   // Make sure any code in the base class which assumes [self view] is
   // the "parent" view continues to work.
   hasToolbar_ = YES;
 
-  if (trackingArea_.get())
-    [[self view] removeTrackingArea:trackingArea_.get()];
   [super dealloc];
 }
 
 // Called after the view is done loading and the outlets have been hooked up.
 // Now we can hook up bridges that rely on UI objects such as the location
 // bar and button state.
 - (void)awakeFromNib {
   [self initCommandStatus:commands_];
   popupPositioner_.reset(new AutocompletePopupPositionerMac(self));
   locationBarView_.reset(new LocationBarViewMac(locationBar_,
@@ skipping 42 matching lines @@
 
   // For a popup window, the toolbar is really just a location bar
   // (see override for [ToolbarController view], below).  When going
   // fullscreen, we remove the toolbar controller's view from the view
   // hierarchy.  Calling [locationBar_ removeFromSuperview] when going
   // fullscreen causes it to get released, making us unhappy
   // (http://crbug.com/18551).  We avoid the problem by incrementing
   // the retain count of the location bar; use of the scoped object
   // helps us remember to release it.
   locationBarRetainer_.reset([locationBar_ retain]);
-  trackingArea_.reset(
-      [[NSTrackingArea alloc] initWithRect:NSZeroRect // Ignored
-                                   options:NSTrackingMouseMoved |
-                                           NSTrackingInVisibleRect |
-                                           NSTrackingMouseEnteredAndExited |
-                                           NSTrackingActiveAlways
-                                     owner:self
-                                  userInfo:nil]);
-  [[self view] addTrackingArea:trackingArea_.get()];
-}
-
-- (void)mouseExited:(NSEvent*)theEvent {
-  [[hoveredButton_ cell] setMouseInside:NO animate:YES];
-  hoveredButton_ = nil;
-}
-
-- (void)mouseMoved:(NSEvent *)theEvent {
-  NSButton *targetView = (NSButton *)[[self view]
-                                      hitTest:[theEvent locationInWindow]];
-  if (![targetView isKindOfClass:[NSButton class]]) targetView = nil;
-  if (hoveredButton_ != targetView) {
-    [[hoveredButton_ cell] setMouseInside:NO animate:YES];
-    [[targetView cell] setMouseInside:YES animate:YES];
-    hoveredButton_ = targetView;
-  }
-}
-
-- (void)mouseEntered:(NSEvent*)event {
-  [self mouseMoved:event];
 }
 
 - (void)resizeView:(NSView*)view newHeight:(float)height {
   DCHECK(view == [bookmarkBarController_ view]);
 
   // The bookmark bar is always rooted at the bottom of the toolbar view, with
   // width equal to the toolbar's width.  The toolbar view is resized to
   // accomodate the new bookmark bar height.
   NSRect frame = NSMakeRect(0, 0, [[self view] bounds].size.width, height);
   [view setFrame:frame];
@@ skipping 221 matching lines @@
   NSRect locationFrame = [locationBar_ frame];
   int minX = NSMinX([starButton_ frame]);
   int maxX = NSMaxX([goButton_ frame]);
   DCHECK(minX < NSMinX(locationFrame));
   DCHECK(maxX > NSMaxX(locationFrame));
 
   NSRect r = NSMakeRect(minX, NSMinY(locationFrame), maxX - minX, 0);
   return gfx::Rect(NSRectToCGRect([[self view] convertRect:r toView:nil]));
 }
 @end