summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/location_bar_view.cc
diff options
context:
space:
mode:
authorbeng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-13 01:17:07 +0000
committerbeng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-13 01:17:07 +0000
commit856ab444ba32f086519a0db875e716844c060560 (patch)
tree12873de0d395c2b236a4654f201bceb4c8c6bf08 /chrome/browser/views/location_bar_view.cc
parent8d752be9a3b26b49415a3b6f7d1bd96611b39fd1 (diff)
downloadchromium_src-856ab444ba32f086519a0db875e716844c060560.zip
chromium_src-856ab444ba32f086519a0db875e716844c060560.tar.gz
chromium_src-856ab444ba32f086519a0db875e716844c060560.tar.bz2
Makes the toolbar/location bar look nice in popup windows.
Rather than creating a frankenstein separate window type for popups, this just uses BrowserView2, and the regular BrowserToolbarView, but hides all the irrelevant controls. B=1031854 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@770 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/location_bar_view.cc')
-rw-r--r--chrome/browser/views/location_bar_view.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/views/location_bar_view.cc b/chrome/browser/views/location_bar_view.cc
index 515646d..ad2a7b5 100644
--- a/chrome/browser/views/location_bar_view.cc
+++ b/chrome/browser/views/location_bar_view.cc
@@ -425,7 +425,9 @@ void LocationBarView::DoLayout(const bool force_layout) {
return;
// TODO(sky): baseline layout.
- int bh = kBackground->height();
+ const SkBitmap* background = popup_window_mode_ ? kPopupBackgroundCenter
+ : kBackground;
+ int bh = background->height();
int location_y = ((GetHeight() - bh) / 2) + kTextVertMargin;
int location_height = bh - (2 * kTextVertMargin);
if (info_label_.IsVisible()) {