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, 30 deletions

diff --git a/views/controls/image_view.cc b/views/controls/image_view.cc
index 9728332..d35585e 100644
--- a/views/controls/image_view.cc
+++ b/views/controls/image_view.cc
@@ -49,12 +49,6 @@ bool ImageView::GetImageSize(gfx::Size* image_size) {
   return image_size_set_;
 }
 
-gfx::Rect ImageView::GetImageBounds() const {
-  gfx::Size image_size(image_size_set_ ?
-    image_size_ : gfx::Size(image_.width(), image_.height()));
-  return gfx::Rect(ComputeImageOrigin(image_size), image_size);
-}
-
 void ImageView::ResetImageSize() {
   image_size_set_ = false;
 }
@@ -71,52 +65,74 @@ gfx::Size ImageView::GetPreferredSize() {
                    image_.height() + insets.height());
 }
 
-gfx::Point ImageView::ComputeImageOrigin(const gfx::Size& image_size) const {
-  gfx::Insets insets = GetInsets();
-
-  int x;
+void ImageView::ComputeImageOrigin(int image_width, int image_height,
+                                   int *x, int *y) {
   // In order to properly handle alignment of images in RTL locales, we need
   // to flip the meaning of trailing and leading. For example, if the
   // horizontal alignment is set to trailing, then we'll use left alignment for
   // the image instead of right alignment if the UI layout is RTL.
   Alignment actual_horiz_alignment = horiz_alignment_;
-  if (UILayoutIsRightToLeft() && (horiz_alignment_ != CENTER))
-    actual_horiz_alignment = (horiz_alignment_ == LEADING) ? TRAILING : LEADING;
+  if (UILayoutIsRightToLeft()) {
+    if (horiz_alignment_ == TRAILING)
+      actual_horiz_alignment = LEADING;
+    if (horiz_alignment_ == LEADING)
+      actual_horiz_alignment = TRAILING;
+  }
+
+  gfx::Insets insets = GetInsets();
+
   switch (actual_horiz_alignment) {
-    case LEADING:  x = insets.left();                                 break;
-    case TRAILING: x = width() - insets.right() - image_size.width(); break;
-    case CENTER:   x = (width() - image_size.width()) / 2;            break;
-    default:       NOTREACHED(); x = 0;                               break;
+    case LEADING:
+      *x = insets.left();
+      break;
+    case TRAILING:
+      *x = width() - insets.right() - image_width;
+      break;
+    case CENTER:
+      *x = (width() - image_width) / 2;
+      break;
+    default:
+      NOTREACHED();
   }
 
-  int y;
   switch (vert_alignment_) {
-    case LEADING:  y = insets.top();                                     break;
-    case TRAILING: y = height() - insets.bottom() - image_size.height(); break;
-    case CENTER:   y = (height() - image_size.height()) / 2;             break;
-    default:       NOTREACHED(); y = 0;                                  break;
+    case LEADING:
+      *y = insets.top();
+      break;
+    case TRAILING:
+      *y = height() - insets.bottom() - image_height;
+      break;
+    case CENTER:
+      *y = (height() - image_height) / 2;
+      break;
+    default:
+      NOTREACHED();
   }
-
-  return gfx::Point(x, y);
 }
 
 void ImageView::Paint(gfx::Canvas* canvas) {
   View::Paint(canvas);
+  int image_width = image_.width();
+  int image_height = image_.height();
 
-  gfx::Rect image_bounds(GetImageBounds());
-  if (image_bounds.IsEmpty())
+  if (image_width == 0 || image_height == 0)
     return;
 
-  if (image_bounds.size() != gfx::Size(image_.width(), image_.height())) {
+  int x, y;
+  if (image_size_set_ &&
+      (image_size_.width() != image_width ||
+       image_size_.width() != image_height)) {
     // Resize case
     image_.buildMipMap(false);
+    ComputeImageOrigin(image_size_.width(), image_size_.height(), &x, &y);
     SkPaint paint;
     paint.setFilterBitmap(true);
-    canvas->DrawBitmapInt(image_, 0, 0, image_.width(), image_.height(),
-        image_bounds.x(), image_bounds.y(), image_bounds.width(),
-        image_bounds.height(), true, paint);
+    canvas->DrawBitmapInt(image_, 0, 0, image_width, image_height,
+                          x, y, image_size_.width(), image_size_.height(),
+                          true, paint);
   } else {
-    canvas->DrawBitmapInt(image_, image_bounds.x(), image_bounds.y());
+    ComputeImageOrigin(image_width, image_height, &x, &y);
+    canvas->DrawBitmapInt(image_, x, y);
   }
 }