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, 61 insertions, 16 deletions

diff --git a/chrome/browser/views/info_bubble.h b/chrome/browser/views/info_bubble.h
index 90911b5..ea80b0f 100644
--- a/chrome/browser/views/info_bubble.h
+++ b/chrome/browser/views/info_bubble.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -7,6 +7,7 @@
 
 #include "third_party/skia/include/core/SkColor.h"
 #include "views/accelerator.h"
+#include "views/view.h"
 #if defined(OS_WIN)
 #include "views/widget/widget_win.h"
 #elif defined(OS_LINUX)
@@ -23,6 +24,7 @@
 // have any additional margins.
 
 class BorderWidget;
+class BubbleBorder;
 class InfoBubble;
 
 namespace views {
@@ -33,6 +35,46 @@ namespace gfx {
 class Path;
 }
 
+// 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() : bubble_border_(NULL) { }
+
+  // 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.
+  virtual 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
+
+ protected:
+  virtual ~BorderContents() { }
+
+  // Margins between the contents and the inside of the border, in pixels.
+  static const int kLeftMargin = 6;
+  static const int kTopMargin = 6;
+  static const int kRightMargin = 6;
+  static const int kBottomMargin = 9;
+
+  BubbleBorder* bubble_border_;
+
+ private:
+  // Overridden from View:
+  virtual void Paint(gfx::Canvas* canvas);
+
+  DISALLOW_COPY_AND_ASSIGN(BorderContents);
+};
+
 #if defined(OS_WIN)
 // This is a window that surrounds the info bubble and paints the margin and
 // border.  It is a separate window so that it can be a layered window, so that
@@ -47,12 +89,15 @@ class BorderWidget : public views::WidgetWin {
   // Given the owning (parent) window, the size of the contained contents
   // (without margins), and the rect (in screen coordinates) to point to,
   // initializes the window and returns the bounds (in screen coordinates) the
-  // contents should use.  |is_rtl| is supplied to
+  // contents should use. |is_rtl| is supplied to
   // BorderContents::InitAndGetBounds(), see its declaration for details.
-  gfx::Rect InitAndGetBounds(HWND owner,
-                             const gfx::Rect& position_relative_to,
-                             const gfx::Size& contents_size,
-                             bool is_rtl);
+  virtual gfx::Rect InitAndGetBounds(HWND owner,
+                                     const gfx::Rect& position_relative_to,
+                                     const gfx::Size& contents_size,
+                                     bool is_rtl);
+
+ protected:
+  BorderContents* border_contents_;
 
  private:
   // Overridden from WidgetWin:
@@ -82,7 +127,7 @@ class InfoBubbleDelegate {
   virtual bool PreferOriginSideAnchor() { return true; }
 };
 
-// TODO: this code is ifdef-tastic. It might be cleaner to refactor the
+// TODO(sky): this code is ifdef-tastic. It might be cleaner to refactor the
 // WidgetFoo subclass into a separate class that calls into InfoBubble.
 // That way InfoBubble has no (or very few) ifdefs.
 class InfoBubble
@@ -120,10 +165,10 @@ class InfoBubble
   virtual ~InfoBubble() {}
 
   // Creates the InfoBubble.
-  void Init(views::Window* parent,
-            const gfx::Rect& position_relative_to,
-            views::View* contents,
-            InfoBubbleDelegate* delegate);
+  virtual void Init(views::Window* parent,
+                    const gfx::Rect& position_relative_to,
+                    views::View* contents,
+                    InfoBubbleDelegate* delegate);
 
 #if defined(OS_WIN)
   // Overridden from WidgetWin:
@@ -133,6 +178,11 @@ class InfoBubble
   virtual void IsActiveChanged();
 #endif
 
+#if defined(OS_WIN)
+  // The window used to render the padding, border and arrow.
+  scoped_ptr<BorderWidget> border_;
+#endif
+
  private:
   // Closes the window notifying the delegate. |closed_by_escape| is true if
   // the close is the result of pressing escape.
@@ -147,11 +197,6 @@ class InfoBubble
   // The window that this InfoBubble is parented to.
   views::Window* parent_;
 
-#if defined(OS_WIN)
-  // The window used to render the padding, border and arrow.
-  scoped_ptr<BorderWidget> border_;
-#endif
-
   // Have we been closed?
   bool closed_;