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

Side by Side Diff: chrome/browser/ui/views/frame/browser_view_layout.h

Issue 6913026: Compact Navigation prototype (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Clang build fix. After commit/revert. Created 9 years, 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_LAYOUT_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_LAYOUT_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_LAYOUT_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_LAYOUT_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "ui/gfx/rect.h" 10 #include "ui/gfx/rect.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 virtual void Uninstalled(views::View* host); 55 virtual void Uninstalled(views::View* host);
56 virtual void ViewAdded(views::View* host, views::View* view); 56 virtual void ViewAdded(views::View* host, views::View* view);
57 virtual void ViewRemoved(views::View* host, views::View* view); 57 virtual void ViewRemoved(views::View* host, views::View* view);
58 virtual void Layout(views::View* host); 58 virtual void Layout(views::View* host);
59 virtual gfx::Size GetPreferredSize(views::View* host); 59 virtual gfx::Size GetPreferredSize(views::View* host);
60 60
61 protected: 61 protected:
62 Browser* browser(); 62 Browser* browser();
63 const Browser* browser() const; 63 const Browser* browser() const;
64 64
65 // Layout the TabStrip, returns the coordinate of the bottom of the TabStrip, 65 // Layout the tab strip region, returns the coordinate of the bottom of the
66 // for laying out subsequent controls. 66 // TabStrip, for laying out subsequent controls. This also lays out the
67 virtual int LayoutTabStrip(); 67 // compact navigation and options bars if the browser is in compact navigation
68 // mode.
69 virtual int LayoutTabStripRegion();
68 70
69 // Layout the following controls, starting at |top|, returns the coordinate 71 // Layout the following controls, starting at |top|, returns the coordinate
70 // of the bottom of the control, for laying out the next control. 72 // of the bottom of the control, for laying out the next control.
71 virtual int LayoutToolbar(int top); 73 virtual int LayoutToolbar(int top);
72 virtual int LayoutBookmarkAndInfoBars(int top); 74 virtual int LayoutBookmarkAndInfoBars(int top);
73 int LayoutBookmarkBar(int top); 75 int LayoutBookmarkBar(int top);
74 int LayoutInfoBar(int top); 76 int LayoutInfoBar(int top);
75 77
76 // Updates |source|'s reserved contents rect by mapping BrowserView's 78 // Updates |source|'s reserved contents rect by mapping BrowserView's
77 // |browser_reserved_rect| into |future_source_bounds| taking into 79 // |browser_reserved_rect| into |future_source_bounds| taking into
(...skipping 27 matching lines...) Expand all
105 const gfx::Rect& vertical_layout_rect() const { 107 const gfx::Rect& vertical_layout_rect() const {
106 return vertical_layout_rect_; 108 return vertical_layout_rect_;
107 } 109 }
108 110
109 // Child views that the layout manager manages. 111 // Child views that the layout manager manages.
110 AbstractTabStripView* tabstrip_; 112 AbstractTabStripView* tabstrip_;
111 ToolbarView* toolbar_; 113 ToolbarView* toolbar_;
112 views::SingleSplitView* contents_split_; 114 views::SingleSplitView* contents_split_;
113 ContentsContainer* contents_container_; 115 ContentsContainer* contents_container_;
114 views::View* infobar_container_; 116 views::View* infobar_container_;
117 views::View* compact_navigation_bar_;
118 views::View* compact_options_bar_;
119 views::View* compact_spacer_;
115 DownloadShelfView* download_shelf_; 120 DownloadShelfView* download_shelf_;
116 BookmarkBarView* active_bookmark_bar_; 121 BookmarkBarView* active_bookmark_bar_;
117 122
118 BrowserView* browser_view_; 123 BrowserView* browser_view_;
119 124
120 // The bounds within which the vertically-stacked contents of the BrowserView 125 // The bounds within which the vertically-stacked contents of the BrowserView
121 // should be laid out within. When the SideTabstrip is not visible, this is 126 // should be laid out within. When the SideTabstrip is not visible, this is
122 // just the local bounds of the BrowserView, otherwise it's the local bounds 127 // just the local bounds of the BrowserView, otherwise it's the local bounds
123 // of the BrowserView less the width of the SideTabstrip. 128 // of the BrowserView less the width of the SideTabstrip.
124 gfx::Rect vertical_layout_rect_; 129 gfx::Rect vertical_layout_rect_;
125 130
126 // The distance the FindBar is from the top of the window, in pixels. 131 // The distance the FindBar is from the top of the window, in pixels.
127 int find_bar_y_; 132 int find_bar_y_;
128 133
129 DISALLOW_COPY_AND_ASSIGN(BrowserViewLayout); 134 DISALLOW_COPY_AND_ASSIGN(BrowserViewLayout);
130 }; 135 };
131 136
132 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_LAYOUT_H_ 137 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_LAYOUT_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.cc ('k') | chrome/browser/ui/views/frame/browser_view_layout.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698