diff options
author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-12 18:57:03 +0000 |
---|---|---|
committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-12 18:57:03 +0000 |
commit | a2b35465c42e3bb3f85c22a869e0dce74b5d8a4c (patch) | |
tree | e800a3fd638bda7b597b8fd0b76af50d3d049ea5 /chrome/browser/views/toolbar_view.cc | |
parent | 5e49b2ce1dc358328ab732520b17414b44081712 (diff) | |
download | chromium_src-a2b35465c42e3bb3f85c22a869e0dce74b5d8a4c.zip chromium_src-a2b35465c42e3bb3f85c22a869e0dce74b5d8a4c.tar.gz chromium_src-a2b35465c42e3bb3f85c22a869e0dce74b5d8a4c.tar.bz2 |
Shift omnibox dropdown in and up on Windows, and square off the top, so it connects to the location bar. Also fix info bubble positioning against location bar icons to put the arrow "up against the icon edge" (fixes the arrow overlapping some page action icons).
Remove BubblePositioner, which is now no longer needed.
BUG=27570,40730
TEST=Omnibox dropdown should line up with editable area edges, icons and text should line up with icon and text in the omnibox. Info bubbles should still be positioned correctly
Review URL: http://codereview.chromium.org/1578021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44268 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/toolbar_view.cc')
-rw-r--r-- | chrome/browser/views/toolbar_view.cc | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc index 97224d1..e69ff0f 100644 --- a/chrome/browser/views/toolbar_view.cc +++ b/chrome/browser/views/toolbar_view.cc @@ -305,30 +305,6 @@ void ToolbarView::ButtonPressed(views::Button* sender, } //////////////////////////////////////////////////////////////////////////////// -// ToolbarView, BubblePositioner implementation: - -gfx::Rect ToolbarView::GetLocationStackBounds() const { - // The number of pixels from the left or right edges of the location stack to - // "just inside the visible borders". When the omnibox bubble contents are - // aligned with this, the visible borders tacked on to the outsides will line - // up with the visible borders on the location stack. - const int kLocationStackEdgeWidth = 2; - - gfx::Point origin; - views::View::ConvertPointToScreen(reload_, &origin); - gfx::Rect stack_bounds(origin.x(), origin.y(), - reload_->width() + location_bar_->width() + go_->width(), - location_bar_->height()); - if (UILayoutIsRightToLeft()) { - stack_bounds.set_x( - stack_bounds.x() - location_bar_->width() - go_->width()); - } - // Inset the bounds to just inside the visible edges (see comment above). - stack_bounds.Inset(kLocationStackEdgeWidth, 0); - return stack_bounds; -} - -//////////////////////////////////////////////////////////////////////////////// // ToolbarView, NotificationObserver implementation: void ToolbarView::Observe(NotificationType type, @@ -620,8 +596,7 @@ void ToolbarView::CreateCenterStack(Profile *profile) { location_bar_ = new LocationBarView(profile, browser_->command_updater(), model_, this, - display_mode_ == DISPLAYMODE_LOCATION, - this); + display_mode_ == DISPLAYMODE_LOCATION); // The Go button. go_ = new GoButton(location_bar_, browser_); |