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

1 files changed, 12 insertions, 0 deletions

diff --git a/chrome/browser/views/toolbar_view.h b/chrome/browser/views/toolbar_view.h
index 48f729e..69c3978c 100644
--- a/chrome/browser/views/toolbar_view.h
+++ b/chrome/browser/views/toolbar_view.h
@@ -161,6 +161,15 @@ class BrowserToolbarView : public ChromeViews::View,
   // Show the app menu.
   void RunAppMenu(const CPoint& pt, HWND hwnd);
 
+  // Types of display mode this toolbar can have.
+  enum DisplayMode {
+    DISPLAYMODE_NORMAL,
+    DISPLAYMODE_LOCATION
+  };
+  bool IsDisplayModeNormal() const {
+    return display_mode_ == DISPLAYMODE_NORMAL;
+  }
+
   // This View's Command Controller
   CommandController* controller_;
 
@@ -194,6 +203,9 @@ class BrowserToolbarView : public ChromeViews::View,
 
   // 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__