Make non-glass popups match new mockup from Glen....

chrome/browser/views/toolbar_view.h

Index: chrome/browser/views/toolbar_view.h
===================================================================
--- chrome/browser/views/toolbar_view.h	(revision 10201)
+++ chrome/browser/views/toolbar_view.h	(working copy)
@@ -52,6 +52,7 @@
 
   // 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 @@
 
   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 @@
     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 @@
   // 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_;