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

diff --git a/chrome/browser/views/app_launcher.cc b/chrome/browser/views/app_launcher.cc
index b5fc226..7cea6af 100644
--- a/chrome/browser/views/app_launcher.cc
+++ b/chrome/browser/views/app_launcher.cc
@@ -16,12 +16,13 @@
 #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"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/dom_view.h"
 #include "chrome/browser/views/info_bubble.h"
 #include "chrome/browser/views/frame/browser_view.h"
+#include "chrome/browser/views/toolbar_view.h"
 #include "chrome/common/url_constants.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
@@ -45,10 +46,11 @@ const int kNavigationEntryYMargin = 1;
 // Padding between the navigation bar and the render view contents.
 const int kNavigationBarBottomPadding = 3;
 
-// NavigationBar size.
-const int kNavigationBarHeight = 25;
+// NavigationBar constants.
+const int kNavigationBarHeight = 23;
+const int kNavigationBarBorderThickness = 1;
 
-// The delta applied to the default font size for the omnibox.
+// The delta applied to the default font size for the Omnibox.
 const int kAutocompleteEditFontDelta = 3;
 
 // Command line switch for specifying url of the page.
@@ -74,8 +76,7 @@ static GURL GetMenuURL() {
 // mode.
 
 class NavigationBar : public views::View,
-                      public AutocompleteEditController,
-                      public BubblePositioner {
+                      public AutocompleteEditController {
  public:
   explicit NavigationBar(AppLauncher* app_launcher)
       : app_launcher_(app_launcher),
@@ -83,7 +84,12 @@ class NavigationBar : public views::View,
     SetFocusable(true);
     location_entry_view_ = new views::NativeViewHost;
     AddChildView(location_entry_view_);
-    set_border(views::Border::CreateSolidBorder(1, SK_ColorGRAY));
+    set_border(views::Border::CreateSolidBorder(kNavigationBarBorderThickness,
+                                                SK_ColorGRAY));
+
+    AddChildView(&popup_positioning_view_);
+    popup_positioning_view_.SetVisible(false);
+    popup_positioning_view_.set_parent_owned(false);
   }
 
   virtual ~NavigationBar() {
@@ -113,7 +119,8 @@ class NavigationBar : public views::View,
         new AutocompleteEditViewWin(font, this, browser->toolbar_model(),
                                     this, GetWidget()->GetNativeView(),
                                     browser->profile(),
-                                    browser->command_updater(), false, this);
+                                    browser->command_updater(), false,
+                                    &popup_positioning_view_);
     location_entry_.reset(autocomplete_view);
     autocomplete_view->Update(NULL);
     // The Update call above sets the autocomplete text to the current one in
@@ -123,10 +130,11 @@ class NavigationBar : public views::View,
     AutocompleteEditViewGtk* autocomplete_view =
         new AutocompleteEditViewGtk(this, browser->toolbar_model(),
                                     browser->profile(),
-                                    browser->command_updater(), false, this);
+                                    browser->command_updater(), false,
+                                    &popup_positioning_view_);
     autocomplete_view->Init();
-    gtk_widget_show_all(autocomplete_view->widget());
-    gtk_widget_hide(autocomplete_view->widget());
+    gtk_widget_show_all(autocomplete_view->GetNativeView());
+    gtk_widget_hide(autocomplete_view->GetNativeView());
     location_entry_.reset(autocomplete_view);
 #else
     NOTIMPLEMENTED();
@@ -143,21 +151,10 @@ class NavigationBar : public views::View,
         bounds.width() - 2 * (kNavigationEntryPadding +
                               kNavigationEntryXMargin),
         bounds.height() - kNavigationEntryYMargin * 2);
-  }
 
-  // BubblePositioner implementation.
-  virtual gfx::Rect GetLocationStackBounds() const {
-    gfx::Rect bounds = location_entry_view_->GetBounds(
-        views::View::APPLY_MIRRORING_TRANSFORMATION);
-    gfx::Point origin(bounds.x(), bounds.bottom() + kNavigationEntryPadding);
-    views::View::ConvertPointToScreen(this, &origin);
-    gfx::Rect rect = gfx::Rect(origin, gfx::Size(500, 0));
-    if (UILayoutIsRightToLeft()) {
-      // Align the window to the right side of the entry view when
-      // UI is RTL mode.
-      rect.set_x(rect.x() - (rect.width() - location_entry_view_->width()));
-    }
-    return rect;
+    gfx::Rect popup_positioning_bounds(bounds);
+    popup_positioning_bounds.Inset(0, -(kNavigationBarBorderThickness + 1));
+    popup_positioning_view_.SetBounds(popup_positioning_bounds);
   }
 
   // AutocompleteController implementation.
@@ -197,6 +194,11 @@ class NavigationBar : public views::View,
   NOTIMPLEMENTED();
 #endif
 
+  // This invisible view is provided to the popup in place of |this|, so the
+  // popup can size itself against it using the same offsets it does with the
+  // LocationBarView.
+  views::View popup_positioning_view_;
+
   DISALLOW_COPY_AND_ASSIGN(NavigationBar);
 };
 
@@ -239,6 +241,7 @@ InfoBubbleContentsView::InfoBubbleContentsView(AppLauncher* app_launcher)
     : app_launcher_(app_launcher),
       navigation_bar_(NULL),
       dom_view_(NULL) {
+  DCHECK(app_launcher);
 }
 
 InfoBubbleContentsView::~InfoBubbleContentsView() {
@@ -301,6 +304,7 @@ void InfoBubbleContentsView::Layout() {
 AppLauncher::AppLauncher(Browser* browser)
     : browser_(browser),
       info_bubble_(NULL) {
+  DCHECK(browser);
   info_bubble_content_ = new InfoBubbleContentsView(this);
 }
 
@@ -308,12 +312,15 @@ AppLauncher::~AppLauncher() {
 }
 
 // static
-AppLauncher* AppLauncher::Show(Browser* browser, const gfx::Rect& bounds) {
+AppLauncher* AppLauncher::Show(Browser* browser,
+                               const gfx::Rect& bounds,
+                               const gfx::Point& bubble_anchor) {
   AppLauncher* app_launcher = new AppLauncher(browser);
   BrowserView* browser_view = static_cast<BrowserView*>(browser->window());
   app_launcher->info_bubble_ =
-      InfoBubble::Show(browser_view->frame()->GetWindow(), bounds,
-                       app_launcher->info_bubble_content_, app_launcher);
+      PinnedContentsInfoBubble::Show(browser_view->frame()->GetWindow(),
+          bounds, bubble_anchor, app_launcher->info_bubble_content_,
+          app_launcher);
   app_launcher->info_bubble_content_->BubbleShown();
   return app_launcher;
 }
@@ -328,7 +335,17 @@ AppLauncher* AppLauncher::ShowForNewTab(Browser* browser) {
   gfx::Point origin = bounds.origin();
   views::RootView::ConvertPointToScreen(tabstrip, &origin);
   bounds.set_origin(origin);
-  return Show(browser, bounds);
+
+  // Figure out where the location bar is, so we can pin the bubble to
+  // make our url bar appear exactly over it.
+  views::RootView* root_view = views::Widget::GetWidgetFromNativeWindow(
+      browser_view->GetNativeHandle())->GetRootView();
+  views::View* location_bar = root_view->GetViewByID(VIEW_ID_LOCATION_BAR);
+  gfx::Point location_bar_origin = location_bar->bounds().origin();
+  views::RootView::ConvertPointToScreen(location_bar->GetParent(),
+                                        &location_bar_origin);
+
+  return Show(browser, bounds, location_bar_origin);
 }
 
 void AppLauncher::Hide() {
@@ -368,7 +385,6 @@ void AppLauncher::InfoBubbleClosing(InfoBubble* info_bubble,
                                    new DeleteTask<AppLauncher>(this));
 }
 
-
 void AppLauncher::AddTabWithURL(const GURL& url,
                                 PageTransition::Type transition) {
 #if defined(OS_CHROMEOS)