Make non-glass popups match new mockup from Glen.

Unfortunately glass popups can't be made to match the mockup unless we want to completely reimplement Windows titlebar drawing, so I'm leaving them pretty much unchanged :(

BUG=7569
Review URL: http://codereview.chromium.org/28072

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10341 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 4 deletions

diff --git a/chrome/browser/views/toolbar_view.h b/chrome/browser/views/toolbar_view.h
index ff77107..4e4a560 100644
--- a/chrome/browser/views/toolbar_view.h
+++ b/chrome/browser/views/toolbar_view.h
@@ -52,6 +52,7 @@ class BrowserToolbarView : public views::View,
 
   // views::View
   virtual void Layout();
+  virtual void Paint(ChromeCanvas* canvas);
   virtual void DidGainFocus();
   virtual void WillLoseFocus();
   virtual bool OnKeyPressed(const views::KeyEvent& e);
@@ -80,10 +81,6 @@ class BrowserToolbarView : public views::View,
 
   LocationBarView* GetLocationBarView() const { return location_bar_; }
 
-  bool IsDisplayModeNormal() const {
-    return display_mode_ == DISPLAYMODE_NORMAL;
-  }
-
   // Updates the toolbar (and transitively the location bar) with the states of
   // the specified |tab|.  If |should_restore_state| is true, we're switching
   // (back?) to this tab and should restore any previous location bar state
@@ -135,6 +132,9 @@ class BrowserToolbarView : public views::View,
     DISPLAYMODE_LOCATION
   };
 
+  // Returns the number of pixels above the location bar in non-normal display.
+  static int PopupTopSpacing();
+
   // NotificationObserver
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
@@ -168,6 +168,10 @@ class BrowserToolbarView : public views::View,
   // accessibility focus.
   virtual void ShowContextMenu(int x, int y, bool is_mouse_gesture);
 
+  bool IsDisplayModeNormal() const {
+    return display_mode_ == DISPLAYMODE_NORMAL;
+  }
+
   scoped_ptr<BackForwardMenuModelWin> back_menu_model_;
   scoped_ptr<BackForwardMenuModelWin> forward_menu_model_;