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

chrome/browser/views/toolbar_view.h

 // Copyright (c) 2006-2008 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.
 
 #ifndef CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_
 #define CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_
 
 #include <vector>
 
 #include "base/ref_counted.h"
@@ skipping 34 matching lines @@
                            public views::BaseButton::ButtonListener {
  public:
   explicit BrowserToolbarView(Browser* browser);
   virtual ~BrowserToolbarView();
 
   // Create the contents of the Browser Toolbar
   void Init(Profile* profile);
 
   // views::View
   virtual void Layout();
+  virtual void Paint(ChromeCanvas* canvas);
   virtual void DidGainFocus();
   virtual void WillLoseFocus();
   virtual bool OnKeyPressed(const views::KeyEvent& e);
   virtual bool OnKeyReleased(const views::KeyEvent& e);
   virtual gfx::Size GetPreferredSize();
 
   // Overridden from EncodingMenuControllerDelegate:
   virtual bool IsItemChecked(int id) const;
 
   // Overridden from Menu::BaseControllerDelegate:
   virtual bool GetAcceleratorInfo(int id, views::Accelerator* accel);
 
   // views::MenuDelegate
   virtual void RunMenu(views::View* source, const CPoint& pt, HWND hwnd);
 
   // GetProfilesHelper::Delegate method.
   virtual void OnGetProfilesDone(const std::vector<std::wstring>& profiles);
 
   // Sets the profile which is active on the currently-active tab.
   void SetProfile(Profile* profile);
   Profile* profile() { return profile_; }
 
   ToolbarStarToggle* star_button() { return star_; }
 
   GoButton* GetGoButton() { return go_; }
 
   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
   // (such as user editing) as well.
   void Update(TabContents* tab, bool should_restore_state);
 
   void OnInputInProgress(bool in_progress);
 
   // Returns the MSAA role of the current view. The role is what assistive
   // technologies (ATs) use to determine what behavior to expect from a given
@@ skipping 31 matching lines @@
   // Overridden from views::BaseButton::ButtonListener:
   virtual void ButtonPressed(views::BaseButton* sender);
 
  private:
   // Types of display mode this toolbar can have.
   enum DisplayMode {
     DISPLAYMODE_NORMAL,
     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,
                        const NotificationDetails& details);
 
   // DragController methods for the star button. These allow the drag if the
   // user hasn't edited the text, the url is valid and should be displayed.
   virtual void WriteDragData(View* sender,
                              int press_x,
                              int press_y,
@@ skipping 13 matching lines @@
   void RunPageMenu(const CPoint& pt, HWND hwnd);
 
   // Show the app menu.
   void RunAppMenu(const CPoint& pt, HWND hwnd);
 
   // Overridden from View, to pass keyboard triggering of the right-click
   // context menu on to the toolbar child view that currently has the
   // 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_;
 
   // The model that contains the security level, text, icon to display...
   ToolbarModel* model_;
 
   // Storage of strings needed for accessibility.
   std::wstring accessible_name_;
   // Child view currently having MSAA focus (location bar excluded from arrow
   // navigation).
@@ skipping 22 matching lines @@
   scoped_refptr<GetProfilesHelper> profiles_helper_;
 
   // Controls whether or not a home button should be shown on the toolbar.
   BooleanPrefMember show_home_button_;
 
   // The display mode used when laying out the toolbar.
   DisplayMode display_mode_;
 };
 
 #endif  // CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_