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, 20 insertions, 54 deletions

diff --git a/chrome/browser/views/info_bubble.cc b/chrome/browser/views/info_bubble.cc
index e5c4858..8150db9 100644
--- a/chrome/browser/views/info_bubble.cc
+++ b/chrome/browser/views/info_bubble.cc
@@ -29,55 +29,17 @@ const SkColor InfoBubble::kBackgroundColor =
 const SkColor InfoBubble::kBackgroundColor = SK_ColorWHITE;
 #endif
 
-// BorderContents -------------------------------------------------------------
-
-// This is used to paint the border of the InfoBubble.  Windows uses this via
-// BorderWidget (see below), while others can use it directly in the bubble.
-class BorderContents : public views::View {
- public:
-  BorderContents() { }
-
-  // Given the size of the contents and the rect to point at, initializes the
-  // bubble and returns the bounds of both the border
-  // and the contents inside the bubble.
-  // |prefer_arrow_on_right| specifies the preferred location for the arrow
-  // anchor. If the bubble does not fit on the monitor, the arrow location may
-  // changed so it can.
-  //
-  // TODO(pkasting): Maybe this should use mirroring transformations instead,
-  // which would hopefully simplify this code.
-  void InitAndGetBounds(
-      const gfx::Rect& position_relative_to,  // In screen coordinates
-      const gfx::Size& contents_size,
-      bool prefer_arrow_on_right,
-      gfx::Rect* contents_bounds,             // Returned in window coordinates
-      gfx::Rect* window_bounds);              // Returned in screen coordinates
-
- private:
-  virtual ~BorderContents() { }
-
-  // Overridden from View:
-  virtual void Paint(gfx::Canvas* canvas);
-
-  DISALLOW_COPY_AND_ASSIGN(BorderContents);
-};
-
 void BorderContents::InitAndGetBounds(
     const gfx::Rect& position_relative_to,
     const gfx::Size& contents_size,
     bool prefer_arrow_on_right,
     gfx::Rect* contents_bounds,
     gfx::Rect* window_bounds) {
-  // Margins between the contents and the inside of the border, in pixels.
-  const int kLeftMargin = 6;
-  const int kTopMargin = 6;
-  const int kRightMargin = 6;
-  const int kBottomMargin = 9;
-
   // Set the border.
-  BubbleBorder* bubble_border = new BubbleBorder;
-  set_border(bubble_border);
-  bubble_border->set_background_color(InfoBubble::kBackgroundColor);
+  if (!bubble_border_)
+    bubble_border_ = new BubbleBorder;
+  set_border(bubble_border_);
+  bubble_border_->set_background_color(InfoBubble::kBackgroundColor);
 
   // Give the contents a margin.
   gfx::Size local_contents_size(contents_size);
@@ -88,9 +50,9 @@ void BorderContents::InitAndGetBounds(
   // bounds.
   BubbleBorder::ArrowLocation arrow_location(prefer_arrow_on_right ?
       BubbleBorder::TOP_RIGHT : BubbleBorder::TOP_LEFT);
-  bubble_border->set_arrow_location(arrow_location);
+  bubble_border_->set_arrow_location(arrow_location);
   *window_bounds =
-      bubble_border->GetBounds(position_relative_to, local_contents_size);
+      bubble_border_->GetBounds(position_relative_to, local_contents_size);
 
   // See if those bounds will fit on the monitor.
   scoped_ptr<WindowSizer::MonitorInfoProvider> monitor_provider(
@@ -109,10 +71,10 @@ void BorderContents::InitAndGetBounds(
       arrow_location = arrow_on_left ?
           BubbleBorder::TOP_LEFT : BubbleBorder::TOP_RIGHT;
     }
-    bubble_border->set_arrow_location(arrow_location);
+    bubble_border_->set_arrow_location(arrow_location);
 
     // Now get the recalculated bounds.
-    *window_bounds = bubble_border->GetBounds(position_relative_to,
+    *window_bounds = bubble_border_->GetBounds(position_relative_to,
                                               local_contents_size);
   }
 
@@ -120,7 +82,7 @@ void BorderContents::InitAndGetBounds(
   // subtracting the border dimensions and margin amounts.
   *contents_bounds = gfx::Rect(gfx::Point(), window_bounds->size());
   gfx::Insets insets;
-  bubble_border->GetInsets(&insets);
+  bubble_border_->GetInsets(&insets);
   contents_bounds->Inset(insets.left() + kLeftMargin, insets.top() + kTopMargin,
       insets.right() + kRightMargin, insets.bottom() + kBottomMargin);
 }
@@ -128,6 +90,8 @@ void BorderContents::InitAndGetBounds(
 void BorderContents::Paint(gfx::Canvas* canvas) {
   // 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);
@@ -150,7 +114,7 @@ void BorderContents::Paint(gfx::Canvas* canvas) {
 #if defined(OS_WIN)
 // BorderWidget ---------------------------------------------------------------
 
-BorderWidget::BorderWidget() {
+BorderWidget::BorderWidget() : border_contents_(NULL) {
   set_delete_on_destroy(false);  // Our owner will free us manually.
   set_window_style(WS_POPUP);
   set_window_ex_style(WS_EX_TOOLWINDOW | WS_EX_LAYERED);
@@ -163,15 +127,16 @@ gfx::Rect BorderWidget::InitAndGetBounds(
     bool prefer_arrow_on_right) {
   // Set up the border view and ask it to calculate our bounds (and our
   // contents').
-  BorderContents* border_contents = new BorderContents;
+  if (!border_contents_)
+    border_contents_ = new BorderContents;
   gfx::Rect contents_bounds, window_bounds;
-  border_contents->InitAndGetBounds(position_relative_to, contents_size,
-                                    prefer_arrow_on_right, &contents_bounds,
-                                    &window_bounds);
+  border_contents_->InitAndGetBounds(position_relative_to, contents_size,
+                                     prefer_arrow_on_right, &contents_bounds,
+                                     &window_bounds);
 
   // Initialize ourselves.
   WidgetWin::Init(GetAncestor(owner, GA_ROOT), window_bounds);
-  SetContentsView(border_contents);
+  SetContentsView(border_contents_);
   SetWindowPos(owner, 0, 0, 0, 0,
                SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOREDRAW);
 
@@ -268,7 +233,8 @@ void InfoBubble::Init(views::Window* parent,
       (contents->UILayoutIsRightToLeft() == delegate->PreferOriginSideAnchor());
 
 #if defined(OS_WIN)
-  border_.reset(new BorderWidget);
+  if (!border_.get())
+    border_.reset(new BorderWidget);
   // Initialize and position the border window.
   window_bounds = border_->InitAndGetBounds(GetNativeView(),
       position_relative_to, contents->GetPreferredSize(),