Shift omnibox dropdown in and up on Windows, and square off the top, so it co...

chrome/browser/views/app_launcher.cc

 // 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.
 
 #include "chrome/browser/views/app_launcher.h"
 
 #include <string>
 #include <vector>
 
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/task.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #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/in_process_webkit/webkit_context.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/render_view_host_factory.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/browser/renderer_host/site_instance.h"
 #include "chrome/browser/renderer_preferences_util.h"
 #include "chrome/browser/tab_contents/render_view_host_delegate_helper.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/views/info_bubble.h"
@@ skipping 17 matching lines @@
 namespace {
 
 // Padding & margins for the navigation entry.
 const int kNavigationEntryPadding = 2;
 const int kNavigationEntryXMargin = 3;
 const int kNavigationEntryYMargin = 1;
 
 // Padding between the navigation bar and the render view contents.
 const int kNavigationBarBottomPadding = 3;
 
-// NavigationBar size.
+// NavigationBar constants.
 const int kNavigationBarHeight = 25;
+const int kNavigationBarBorderThickness = 1;
 
 // The delta applied to the default font size for the omnibox.
 const int kAutocompleteEditFontDelta = 3;
 
 // Command line switch for specifying url of the page.
 const wchar_t kURLSwitch[] = L"main-menu-url";
 
 // Returns the URL of the menu.
 static GURL GetMenuURL() {
   std::wstring url_string =
@@ skipping 71 matching lines @@
   app_launcher_->Hide();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NavigationBar
 //
 // A navigation bar that is shown in the app launcher in compact navigation bar
 // mode.
 
 class NavigationBar : public views::View,
-                      public AutocompleteEditController,
-                      public BubblePositioner {
+                      public AutocompleteEditController {
  public:
   explicit NavigationBar(AppLauncher* app_launcher)
       : app_launcher_(app_launcher),
         location_entry_view_(NULL) {
     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() {
     if (location_entry_view_->native_view())
       location_entry_view_->Detach();
   }
 
   // views::View overrides.
   virtual void Focus() {
     location_entry_->SetFocus();
     location_entry_->SelectAll(true);
   }
 
   virtual void ViewHierarchyChanged(bool is_add,
                                     views::View* parent,
                                     views::View* child) {
     if (!is_add || child != this)
       return;
 
     DCHECK(!location_entry_.get());
 
     Browser* browser = app_launcher_->browser();
 #if defined (OS_WIN)
     gfx::Font font;
     font = font.DeriveFont(kAutocompleteEditFontDelta);
     AutocompleteEditViewWin* autocomplete_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
     // the location bar, make sure to clear it.
     autocomplete_view->SetUserText(std::wstring());
 #elif defined(OS_LINUX) && defined(TOOLKIT_VIEWS)
     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->GetNativeView());
     gtk_widget_hide(autocomplete_view->GetNativeView());
     location_entry_.reset(autocomplete_view);
 #else
     NOTIMPLEMENTED();
 #endif
     location_entry_view_->set_focus_view(this);
     location_entry_view_->Attach(location_entry_->GetNativeView());
   }
 
   virtual void Layout() {
     gfx::Rect bounds = GetLocalBounds(false);
     location_entry_view_->SetBounds(
         bounds.x() + kNavigationEntryXMargin + kNavigationEntryPadding,
         bounds.y() + kNavigationEntryYMargin,
         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.
   virtual void OnAutocompleteAccept(const GURL& url,
                                     WindowOpenDisposition disposition,
                                     PageTransition::Type transition,
                                     const GURL& alternate_nav_url) {
     app_launcher_->AddTabWithURL(url, transition);
     app_launcher_->Hide();
   }
@@ skipping 19 matching lines @@
   AppLauncher* app_launcher_;
   views::NativeViewHost* location_entry_view_;
 #if defined(OS_WIN)
   scoped_ptr<AutocompleteEditViewWin> location_entry_;
 #elif defined(OS_LINUX) && defined(TOOLKIT_VIEWS)
   scoped_ptr<AutocompleteEditViewGtk> location_entry_;
 #else
   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);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // InfoBubbleContentsView
 //
 // The view that contains the navigation bar and render view.
 // It is displayed in an info-bubble.
 
 class InfoBubbleContentsView : public views::View {
@@ skipping 235 matching lines @@
     }
     case chromeos::StatusAreaView::OPEN_TABS_ON_RIGHT: {
       browser_->AddTabWithURL(url, GURL(), transition, true, -1, true, NULL);
       break;
     }
   }
 #else
   browser_->AddTabWithURL(url, GURL(), transition, true, -1, true, NULL);
 #endif
 }