Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3960)

Unified Diff: chrome/browser/ui/views/toolbar_view.h

Issue 10854017: Basic metro snap view omnibox. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix chromeos compilation. Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/omnibox/omnibox_views.cc ('k') | chrome/browser/ui/views/toolbar_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/toolbar_view.h
diff --git a/chrome/browser/ui/views/toolbar_view.h b/chrome/browser/ui/views/toolbar_view.h
index b2445133b0a2541b5ce61dab127bd0c17ab8e117..b9b80f0ae0dbe6138c16bda7afac1134333f62fa 100644
--- a/chrome/browser/ui/views/toolbar_view.h
+++ b/chrome/browser/ui/views/toolbar_view.h
@@ -51,6 +51,15 @@ class ToolbarView : public views::AccessiblePaneView,
// The view class name.
static const char kViewClassName[];
+ // Types of display mode this toolbar can have.
+ enum DisplayMode {
+ DISPLAYMODE_NORMAL, // Normal toolbar with buttons, etc.
+ DISPLAYMODE_LOCATION, // Slimline toolbar showing only compact location
+ // bar, used for popups.
+ DISPLAYMODE_METROSNAP, // Non-interactive slimline toolbar used for metro
+ // metro snap.
+ };
+
explicit ToolbarView(Browser* browser);
virtual ~ToolbarView();
@@ -91,6 +100,9 @@ class ToolbarView : public views::AccessiblePaneView,
// some toolbar children views change in visibility.
void LayoutForSearch();
+ // Allows setting the display mode to metro snap.
+ void SetMetroSnapDisplayMode(bool enable);
+
// Accessors...
Browser* browser() const { return browser_; }
BrowserActionsContainer* browser_actions() const { return browser_actions_; }
@@ -171,12 +183,6 @@ class ToolbarView : public views::AccessiblePaneView,
virtual void RemovePaneFocus() OVERRIDE;
private:
- // Types of display mode this toolbar can have.
- enum DisplayMode {
- DISPLAYMODE_NORMAL, // Normal toolbar with buttons, etc.
- DISPLAYMODE_LOCATION // Slimline toolbar showing only compact location
- // bar, used for popups.
- };
// Returns true if we should show the upgrade recommended dot.
bool ShouldShowUpgradeRecommended();
@@ -228,6 +234,9 @@ class ToolbarView : public views::AccessiblePaneView,
views::MenuButton* app_menu_;
Browser* browser_;
+ // The View to add the omnibox popup view to.
+ views::View* popup_parent_view_;
+
// Contents of the profiles menu to populate with profile names.
scoped_ptr<ui::SimpleMenuModel> profiles_menu_contents_;
« no previous file with comments | « chrome/browser/ui/views/omnibox/omnibox_views.cc ('k') | chrome/browser/ui/views/toolbar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698