Re-instate the temporary revert from r45267. That reverted certain

Omnibox, toolbar, tab animations, and other UI changes for purposes of
testing and merging into mstone-5.

Additionally reverts these CLs to fix the earlier revert:
r45271: [Mac] Image references missing from Omnibox revert.
r45268: GTK fix merge failure in uber-revert.

Additional revert which fixed a bug for the branch:
r45381: [Mac] Omnibox popup icons and text lined up under toolbar.

Slight merge conflict which should be good:
r45322: GTK: Implement OnDragCanceled() for autocomplete...

Also ++kThemePackVersion and regenerate the cached theme pak.

Re-instated changes:
r45213: GTK: Override cursor colors in chrome-theme mode.
r45103: Support drawing nano tabs in the tabstrip.
r45084: GTK: Position the EV certificate stuff inside a green bubble.
r44979: Subclassing the InfoBubble to handle anchoring bubbles basedon...
r44957: GTK: Tint the geolocation icons in gtk mode.
r44943: Changes FormatURL to not strip http if the host starts with ft...
r44930: Remove an icon that is no longer used.
r44929: SSL UI changes, Windows, code side (images are separate).
r44859: SSL UI changes (icons).  TBRed since trybots hate binary patches.
r44822: GTK: Select better greens in the native omnibox popup.
r44814: GTK: navigate to URL on PRIMARY when middle-clicking the locat...
r44789: [Mac] Bookmark star missing on NTP and BMM.
r44775: [Mac] Centralize hack to make tests work with AutocompleteClas...
r44678: Display the SECURITY_WARNING status in the location bar for the
r44648: [Mac] Add an arrow cursor rect for the location image.
r44615: Revert r44611 because it may have broken "unit_tests" on "Vist...
r44611: Display the SECURITY_WARNING status in the location bar for the
r44577: Revert 44572 - [Mac] Update locationbar icon as user types.
r44572: [Mac] Update location-bar icon as user types.
r44555: GTK: Use correct button mask on reload button.
r44545: [Mac] Omnibox text drag drag URL when select-all.
r44523: GTK: Prevent inappropriate drag of location bar location icon.
r44519: GTK: make the primary selection include the url's scheme when ...
r44492: [Mac] Fix search icon in keyword search to be right-side-up.
r44415: GTK: Update top padding on icons in the autocomplete popup.
r44401: GTK: Tint omnibox icons in GTK mode differently.
r44380: GTK: Move reload in gtk mode and fix omnibox popup location.
r44282: Fixes crash in autocomplete when typing some URLs. The problem
r44273: [Mac] PDF icons for omnibox nits.
r44269: Fix build break due to bad merge resolve
r44268: Shift omnibox dropdown in and up on Windows, and square off th...
r44178: GTK: fix TTS padding.
r44177: Round the top left and right edges of the toolbar.
r44171: Images only checkin for try server goodness.
r44163: GTK: fix padding of autocomplete popup.
r44152: [Mac] PDF icons for omnibox.
r44145: GTK: Theme the icons in the location bar and use GTK colors fo...
r44140: Strips http from the omnibox
r44131: Fixes bugs in new tab strip animations where they weren't doin...
r44116: Change the default theme colors.
r44117: Add newline to EOF to fix CrOS builder.
r44115: Make the bottom edges of the opaque frame rounded.
r44091: [Mac] No star icon or page actions in omnibox on popups.
r44087: Don't allow drag or click on location icon when editing in omn...
r44021: [GTK] Add TTS lens graphic to linux TTS box.
r44008: [Mac] Tweak location icon spacing in omnibox.
r43977: GTK: don't show the star or page actions in ShouldOnlyShowLoca...
r43972: Make the firstrun bubble point at a better spot now that the l...
r43971: [Mac] Location icon in omnibox as drag source.
r43970: Make the star and page action icons not appear on popup windows.
r43954: Fixes bug in TabStrip where dragging tab out then back in rapidly
r43864: Tweaks to BoundsAnimator/SlideAnimation and TabStrip:
r43787: Allow location icon to be dragged & dropped.  This also fixes ...
r43759: Changes end cap of tab-to-search images.
r43740: Change bookmark bar toggle to ctrl-shift-b.
r43723: Show Page Info dialog on mouse up, not mouse down.
r43677: Fix Mac build failure.
r43676: Replace omnibox icons with new set that are all the same size ...
r43596: Fix browser test TestStarButtonAccObj.
r43593: Disables TestStarButtonAccObj.
r43582: Changes tab strip to use BoundsAnimator for tab strip animatio...
r43563: GTK: don't show reload button for popup/app windows.
r43562: Star/reload shuffle, Windows version.
r43540: [Mac] Magnifying glass in keyword-search bubble.
r43482: Adds images needed for new tab animation. I'm separating this ...
r43422: Add reload mask resource.
r43392: GTK: make the location icon a drag source.
r43376: [Mac] Move star button into page-actions area of omnibox.
r43357: [Mac] Line up omnibox popup under field.
r43290: gtk: fix display of icons in omnibox popup
r43269: GTK: fix reload button.
r43249: [Mac] Rearrange SSL status icon/label in omnibox.
r43248: BrowserThemePack: Adds persistant ids for the reload endcaps.
r43241: GTK: more location bar updates.
r43191: Fix memory leak in BrowserThemePack.
r43154: GTK: set the new star button's ID
r43151: Fix bad conflict resolution for r43146.
r43146: GTK: toolbar reload/star shuffle.
r43025: Show the location bar icon (almost) all the time, and have its...
r43023: Add new images for new reload button. No code change.
r42782: Remove this icon, now that it's no longer used (due to my secu...
r42502: Omnibox M5 work, part 1: Security changes
r42245: Check in new icons for omnibox security changes alone, so that...

BUG=none
TEST=People go back to complaining about missing http://.
R=pkasting@chromium.org,beng@chromium.org

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45474 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 15 insertions, 89 deletions

diff --git a/chrome/browser/cocoa/toolbar_controller.mm b/chrome/browser/cocoa/toolbar_controller.mm
index 1412fc1..a9c4a33 100644
--- a/chrome/browser/cocoa/toolbar_controller.mm
+++ b/chrome/browser/cocoa/toolbar_controller.mm
@@ -15,7 +15,6 @@
 #include "chrome/browser/autocomplete/autocomplete_edit_view.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_window.h"
-#include "chrome/browser/bubble_positioner.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"
@@ -51,8 +50,6 @@ NSString* const kBackButtonImageName = @"back_Template.pdf";
 NSString* const kForwardButtonImageName = @"forward_Template.pdf";
 NSString* const kReloadButtonImageName = @"reload_Template.pdf";
 NSString* const kHomeButtonImageName = @"home_Template.pdf";
-NSString* const kStarButtonImageName = @"star_Template.pdf";
-NSString* const kStarButtonFillingImageName = @"starred.pdf";
 NSString* const kGoButtonGoImageName = @"go_Template.pdf";
 NSString* const kGoButtonStopImageName = @"stop_Template.pdf";
 NSString* const kPageButtonImageName = @"menu_page_Template.pdf";
@@ -87,26 +84,6 @@ const CGFloat kAnimationDuration = 0.2;
 - (void)adjustLocationAndGoPositionsBy:(CGFloat)dX animate:(BOOL)animate;
 @end
 
-namespace {
-
-// A C++ class used to correctly position the omnibox.
-class BubblePositionerMac : public BubblePositioner {
- public:
-  BubblePositionerMac(ToolbarController* controller)
-      : controller_(controller) { }
-  virtual ~BubblePositionerMac() { }
-
-  // BubblePositioner:
-  virtual gfx::Rect GetLocationStackBounds() const {
-    return [controller_ locationStackBounds];
-  }
-
- private:
-  ToolbarController* controller_;  // weak, owns us
-};
-
-}  // namespace
-
 namespace ToolbarControllerInternal {
 
 // A C++ delegate that handles enabling/disabling menu items and handling when
@@ -225,7 +202,6 @@ class PrefObserverBridge : public NotificationObserver {
   [forwardButton_ setImage:nsimage_cache::ImageNamed(kForwardButtonImageName)];
   [reloadButton_ setImage:nsimage_cache::ImageNamed(kReloadButtonImageName)];
   [homeButton_ setImage:nsimage_cache::ImageNamed(kHomeButtonImageName)];
-  [starButton_ setImage:nsimage_cache::ImageNamed(kStarButtonImageName)];
   [goButton_ setImage:nsimage_cache::ImageNamed(kGoButtonGoImageName)];
   [pageButton_ setImage:nsimage_cache::ImageNamed(kPageButtonImageName)];
   [wrenchButton_ setImage:nsimage_cache::ImageNamed(kWrenchButtonImageName)];
@@ -234,9 +210,7 @@ class PrefObserverBridge : public NotificationObserver {
   [wrenchButton_ setShowsBorderOnlyWhileMouseInside:YES];
 
   [self initCommandStatus:commands_];
-  bubblePositioner_.reset(new BubblePositionerMac(self));
   locationBarView_.reset(new LocationBarViewMac(locationBar_,
-                                                bubblePositioner_.get(),
                                                 commands_, toolbarModel_,
                                                 profile_, browser_));
   [locationBar_ setFont:[NSFont systemFontOfSize:[NSFont systemFontSize]]];
@@ -312,10 +286,6 @@ class PrefObserverBridge : public NotificationObserver {
   [[homeButton_ cell]
       accessibilitySetOverrideValue:description
                        forAttribute:NSAccessibilityDescriptionAttribute];
-  description = l10n_util::GetNSStringWithFixup(IDS_ACCNAME_STAR);
-  [[starButton_ cell]
-      accessibilitySetOverrideValue:description
-                       forAttribute:NSAccessibilityDescriptionAttribute];
   description = l10n_util::GetNSStringWithFixup(IDS_ACCNAME_LOCATION);
   [[locationBar_ cell]
       accessibilitySetOverrideValue:description
@@ -393,9 +363,6 @@ class PrefObserverBridge : public NotificationObserver {
     case IDC_HOME:
       button = homeButton_;
       break;
-    case IDC_BOOKMARK_PAGE:
-      button = starButton_;
-      break;
   }
   [button setEnabled:enabled];
 }
@@ -408,8 +375,6 @@ class PrefObserverBridge : public NotificationObserver {
       setEnabled:commands->IsCommandEnabled(IDC_FORWARD) ? YES : NO];
   [reloadButton_ setEnabled:commands->IsCommandEnabled(IDC_RELOAD) ? YES : NO];
   [homeButton_ setEnabled:commands->IsCommandEnabled(IDC_HOME) ? YES : NO];
-  [starButton_
-      setEnabled:commands->IsCommandEnabled(IDC_BOOKMARK_PAGE) ? YES : NO];
 }
 
 - (void)updateToolbarWithContents:(TabContents*)tab
@@ -424,23 +389,7 @@ class PrefObserverBridge : public NotificationObserver {
 }
 
 - (void)setStarredState:(BOOL)isStarred {
-  NSImage* starImage = nil;
-  NSString* toolTip;
-  if (isStarred) {
-    starImage = nsimage_cache::ImageNamed(kStarButtonFillingImageName);
-    // Cache the string since we'll need it a lot
-    static NSString* starredToolTip =
-        [l10n_util::GetNSStringWithFixup(IDS_TOOLTIP_STARRED) retain];
-    toolTip = starredToolTip;
-  } else {
-    // Cache the string since we'll need it a lot
-    static NSString* starToolTip =
-        [l10n_util::GetNSStringWithFixup(IDS_TOOLTIP_STAR) retain];
-    toolTip = starToolTip;
-  }
-
-  [(GradientButtonCell*)[starButton_ cell] setUnderlayImage:starImage];
-  [starButton_ setToolTip:toolTip];
+  locationBarView_->SetStarred(isStarred ? true : false);
 }
 
 - (void)setIsLoading:(BOOL)isLoading {
@@ -469,7 +418,7 @@ class PrefObserverBridge : public NotificationObserver {
 
   // Make location bar not editable when in a pop-up.
   // TODO(viettrungluu): is this right (all the time)?
-  [locationBar_ setEditable:toolbar];
+  locationBarView_->SetEditable(toolbar ? true : false);
 }
 
 - (NSView*)view {
@@ -507,7 +456,7 @@ class PrefObserverBridge : public NotificationObserver {
 // Returns an array of views in the order of the outlets above.
 - (NSArray*)toolbarViews {
   return [NSArray arrayWithObjects:backButton_, forwardButton_, reloadButton_,
-            homeButton_, starButton_, goButton_, pageButton_, wrenchButton_,
+            homeButton_, goButton_, pageButton_, wrenchButton_,
             locationBar_, browserActionsContainerView_, nil];
 }
 
@@ -520,14 +469,16 @@ class PrefObserverBridge : public NotificationObserver {
   return frame;
 }
 
-// Computes the padding between the buttons that should have a separation from
-// the positions in the nib. Since the forward and reload buttons are always
-// visible, we use those buttons as the canonical spacing.
+// Computes the padding between the buttons that should have a
+// separation from the positions in the nib.  |homeButton_| is right
+// of |forwardButton_| unless it has been hidden, in which case
+// |reloadButton_| is in that spot.
 - (CGFloat)interButtonSpacing {
-  NSRect forwardFrame = [forwardButton_ frame];
-  NSRect reloadFrame = [reloadButton_ frame];
-  DCHECK(NSMinX(reloadFrame) > NSMaxX(forwardFrame));
-  return NSMinX(reloadFrame) - NSMaxX(forwardFrame);
+  const NSRect forwardFrame = [forwardButton_ frame];
+  NSButton* nextButton = [homeButton_ isHidden] ? reloadButton_ : homeButton_;
+  const NSRect nextButtonFrame = [nextButton frame];
+  DCHECK_GT(NSMinX(nextButtonFrame), NSMaxX(forwardFrame));
+  return NSMinX(nextButtonFrame) - NSMaxX(forwardFrame);
 }
 
 // Show or hide the home button based on the pref.
@@ -546,7 +497,7 @@ class PrefObserverBridge : public NotificationObserver {
   if (hide)
     moveX *= -1;  // Reverse the direction of the move.
 
-  [starButton_ setFrame:NSOffsetRect([starButton_ frame], moveX, 0)];
+  [reloadButton_ setFrame:NSOffsetRect([reloadButton_ frame], moveX, 0)];
   [locationBar_ setFrame:[self adjustRect:[locationBar_ frame]
                                  byAmount:moveX]];
   [homeButton_ setHidden:hide];
@@ -769,8 +720,8 @@ class PrefObserverBridge : public NotificationObserver {
   [NSAnimationContext endGrouping];
 }
 
-- (NSRect)starButtonInWindowCoordinates {
-  return [starButton_ convertRect:[starButton_ bounds] toView:nil];
+- (NSRect)starIconInWindowCoordinates {
+  return [locationBar_ convertRect:[locationBar_ starIconFrame] toView:nil];
 }
 
 - (CGFloat)desiredHeightForCompression:(CGFloat)compressByHeight {
@@ -845,31 +796,6 @@ class PrefObserverBridge : public NotificationObserver {
 
 }
 
-- (gfx::Rect)locationStackBounds {
-  // The number of pixels from the left or right edges of the location stack to
-  // "just inside the visible borders".  When the omnibox bubble contents are
-  // aligned with this, the visible borders tacked on to the outsides will line
-  // up with the visible borders on the location stack.
-  const int kLocationStackEdgeWidth = 2;
-
-  const NSRect locationFrame = [locationBar_ frame];
-
-  // Expand to include star and go buttons.  Including the widths
-  // rather that calculating from their current placement because this
-  // method can be called while the resize is still rearranging the
-  // views involved.
-  const CGFloat minX = NSMinX(locationFrame) - NSWidth([starButton_ frame]);
-  const CGFloat maxX = NSMaxX(locationFrame) + NSWidth([goButton_ frame]);
-
-  NSRect r = NSMakeRect(minX, NSMinY(locationFrame), maxX - minX,
-                        NSHeight(locationFrame));
-  gfx::Rect stack_bounds(
-      NSRectToCGRect([[self view] convertRect:r toView:nil]));
-  // Inset the bounds to just inside the visible edges (see comment above).
-  stack_bounds.Inset(kLocationStackEdgeWidth, 0);
-  return stack_bounds;
-}
-
 // (URLDropTargetController protocol)
 - (void)dropURLs:(NSArray*)urls inView:(NSView*)view at:(NSPoint)point {
   // TODO(viettrungluu): This code is more or less copied from the code in