Temporarily revert certain Omnibox, toolbar, tab animations, and other

UI changes for purposes of testing and merging into mstone-5.

Also ++kThemePackVersion and regenerate the cached theme pak.

Reverted 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=Eyjafjallajokull
R=pkasting@chromium.org,beng@chromium.org

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

1 files changed, 46 insertions, 61 deletions

diff --git a/chrome/browser/views/bubble_border.cc b/chrome/browser/views/bubble_border.cc
index 3548286..230a0f4 100644
--- a/chrome/browser/views/bubble_border.cc
+++ b/chrome/browser/views/bubble_border.cc
@@ -1,6 +1,6 @@
-// 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.
+// 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 "chrome/browser/views/bubble_border.h"
 
@@ -31,6 +31,10 @@ static const int kArrowInteriorHeight = 7;
 
 gfx::Rect BubbleBorder::GetBounds(const gfx::Rect& position_relative_to,
                                   const gfx::Size& contents_size) const {
+  // The spacing (in pixels) between |position_relative_to| and the bubble
+  // content.
+  const int kBubbleSpacing = 2;
+
   // Desired size is size of contents enlarged by the size of the border images.
   gfx::Size border_size(contents_size);
   gfx::Insets insets;
@@ -39,40 +43,33 @@ gfx::Rect BubbleBorder::GetBounds(const gfx::Rect& position_relative_to,
                       insets.top() + insets.bottom());
 
   // Screen position depends on the arrow location.
-  // The arrow should overlap the target by some amount since the bottom arrow
-  // has lots of shadow below it and the top arrow is given an equivalent amount
-  // of padding.
-  const int kArrowOverlap = 3;
   int x = position_relative_to.x() + (position_relative_to.width() / 2);
-  int arrow_offset = override_arrow_x_offset_ ? override_arrow_x_offset_ :
-                                                arrow_x_offset_;
   if (arrow_is_left())
-    x -= arrow_offset;
+    x -= arrow_x_offset_;
   else if (arrow_location_ == NONE)
     x -= ((contents_size.width() / 2) + insets.left());
   else
-    x += (arrow_offset - border_size.width() + 1);
+    x += (arrow_x_offset_ - border_size.width() + 1);
   int y = position_relative_to.y();
-  if (arrow_is_bottom())
-    y += (kArrowOverlap - border_size.height());
-  else if (arrow_location_ == NONE)
-    y += position_relative_to.height();
-  else
-    y += (position_relative_to.height() - kArrowOverlap);
+  if (arrow_is_top()) {
+    y += (position_relative_to.height() -
+        (top_arrow_->height() - kBubbleSpacing));
+  } else if (arrow_location_ == NONE) {
+    y += (position_relative_to.height() - (top_->height() - kBubbleSpacing));
+  } else {
+    y += ((bottom_arrow_->height() - kBubbleSpacing) - border_size.height());
+  }
 
   return gfx::Rect(x, y, border_size.width(), border_size.height());
 }
 
 void BubbleBorder::GetInsets(gfx::Insets* insets) const {
-  int top, bottom;
-  if (arrow_is_bottom()) {
-    top = top_->height();
-    bottom = std::max(bottom_->height(), bottom_arrow_->height());
-  } else {
-    top = (arrow_location_ == NONE) ?
-        0 : std::max(top_->height(), top_arrow_->height());
-    bottom = bottom_->height();
-  }
+  int top = top_->height();
+  int bottom = bottom_->height();
+  if (arrow_is_top())
+    top = std::max(top, top_arrow_->height());
+  else if (arrow_location_ != NONE)
+    bottom = std::max(bottom, bottom_arrow_->height());
   insets->Set(top, left_->width(), bottom, right_->width());
 }
 
@@ -105,7 +102,7 @@ void BubbleBorder::InitClass() {
 }
 
 void BubbleBorder::Paint(const views::View& view, gfx::Canvas* canvas) const {
-  // Convenience shorthand variables.
+  // Convenience shorthand variables
   int width = view.width();
   int tl_width = top_left_->width();
   int tl_height = top_left_->height();
@@ -135,33 +132,25 @@ void BubbleBorder::Paint(const views::View& view, gfx::Canvas* canvas) const {
    * border_bottom∙∙∙∙└────┴─┤ ▼ ├──────┤ ▼ ├─┴────┘
    * view.height()∙∙∙∙∙∙∙∙∙∙∙└───┘      └───┘
    *
-   * If |arrow_location_| == NONE, the entire top edge is ommitted, and
-   * |tl_bottom| == |tr_bottom| == 0.  Otherwise, one of the four arrows will be
-   * drawn.
+   *           (At most one of the arrows will be drawn)
    */
 
   gfx::Insets insets;
   GetInsets(&insets);
   int top = insets.top();
+  int border_top = top - t_height;
+  int tl_bottom = border_top + tl_height;
+  int tr_bottom = border_top + tr_height;
   int bottom = view.height() - insets.bottom();
   int border_bottom = bottom + b_height;
   int bl_y = border_bottom - bl_height;
   int br_y = border_bottom - br_height;
 
-  int border_top, tl_bottom, tr_bottom;
-  if (arrow_location_ == NONE) {
-    border_top = tl_bottom = tr_bottom = 0;
-  } else {
-    border_top = top - t_height;
-    tl_bottom = border_top + tl_height;
-    tr_bottom = border_top + tr_height;
-
-    // Top left corner
-    canvas->DrawBitmapInt(*top_left_, 0, border_top);
+  // Top left corner
+  canvas->DrawBitmapInt(*top_left_, 0, border_top);
 
-    // Top right corner
-    canvas->DrawBitmapInt(*top_right_, width - tr_width, border_top);
-  }
+  // Top right corner
+  canvas->DrawBitmapInt(*top_right_, width - tr_width, border_top);
 
   // Right edge
   canvas->TileImageInt(*right_, width - r_width, tr_bottom, r_width,
@@ -178,7 +167,7 @@ void BubbleBorder::Paint(const views::View& view, gfx::Canvas* canvas) const {
   canvas->TileImageInt(*left_, 0, tl_bottom, left_->width(), bl_y - tl_bottom);
 
   // Arrow edge, if necessary
-  bool should_draw_top_edge = false;
+  bool should_draw_top_edge = true;
   bool should_draw_bottom_edge = true;
   if (arrow_location_ != NONE) {
     /* Here's what the variables below mean (without loss of generality):
@@ -205,17 +194,8 @@ void BubbleBorder::Paint(const views::View& view, gfx::Canvas* canvas) const {
     SkBitmap* arrow;
     int left_of_edge, right_of_edge, edge_y, arrow_y;
     SkScalar border_y, tip_y;
-    if (arrow_is_bottom()) {
-      should_draw_top_edge = true;
-      should_draw_bottom_edge = false;
-      edge = bottom_;
-      arrow = bottom_arrow_;
-      left_of_edge = bl_width;
-      right_of_edge = br_width;
-      edge_y = arrow_y = bottom;
-      border_y = SkIntToScalar(bottom);
-      tip_y = SkIntToScalar(bottom + kArrowInteriorHeight);
-    } else {
+    if (arrow_is_top()) {
+      should_draw_top_edge = false;
       edge = top_;
       arrow = top_arrow_;
       left_of_edge = tl_width;
@@ -224,12 +204,19 @@ void BubbleBorder::Paint(const views::View& view, gfx::Canvas* canvas) const {
       arrow_y = top - top_arrow_->height();
       border_y = SkIntToScalar(top);
       tip_y = SkIntToScalar(top - kArrowInteriorHeight);
+    } else {
+      should_draw_bottom_edge = false;
+      edge = bottom_;
+      arrow = bottom_arrow_;
+      left_of_edge = bl_width;
+      right_of_edge = br_width;
+      edge_y = arrow_y = bottom;
+      border_y = SkIntToScalar(bottom);
+      tip_y = SkIntToScalar(bottom + kArrowInteriorHeight);
     }
-    int arrow_offset = override_arrow_x_offset_ ? override_arrow_x_offset_ :
-                                                  arrow_x_offset_;
-    int arrow_width = arrow->width();
+    int arrow_width = (arrow_is_top() ? top_arrow_ : bottom_arrow_)->width();
     int arrow_center = arrow_is_left() ?
-        arrow_offset : width - arrow_offset - 1;
+        arrow_x_offset_ : width - arrow_x_offset_ - 1;
     int arrow_x = arrow_center - (arrow_width / 2);
     SkScalar arrow_interior_x =
         SkIntToScalar(arrow_center - kArrowInteriorHeight);
@@ -284,8 +271,6 @@ void BubbleBorder::Paint(const views::View& view, gfx::Canvas* canvas) const {
 void BubbleBackground::Paint(gfx::Canvas* canvas, views::View* view) const {
   // The border of this view creates an anti-aliased round-rect region for the
   // contents, which we need to fill with the background color.
-  // NOTE: This doesn't handle an arrow location of "NONE", which has square top
-  // corners.
   SkPaint paint;
   paint.setAntiAlias(true);
   paint.setStyle(SkPaint::kFill_Style);