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

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

Issue 16021009: Redo display of web contents modal dialog under the bookmark bar (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Handle detached bookmarks bar Created 7 years, 6 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
« no previous file with comments | « no previous file | chrome/browser/ui/views/frame/browser_view_layout.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/gtest_prod_util.h" 10 #include "base/gtest_prod_util.h"
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 113
114 Browser* browser() { return browser_; } 114 Browser* browser() { return browser_; }
115 115
116 // Layout the tab strip region, returns the coordinate of the bottom of the 116 // Layout the tab strip region, returns the coordinate of the bottom of the
117 // TabStrip, for laying out subsequent controls. 117 // TabStrip, for laying out subsequent controls.
118 int LayoutTabStripRegion(views::View* browser_view); 118 int LayoutTabStripRegion(views::View* browser_view);
119 119
120 // Layout the following controls, starting at |top|, returns the coordinate 120 // Layout the following controls, starting at |top|, returns the coordinate
121 // of the bottom of the control, for laying out the next control. 121 // of the bottom of the control, for laying out the next control.
122 int LayoutToolbar(int top); 122 int LayoutToolbar(int top);
123 int LayoutBookmarkAndInfoBars(int top); 123 int LayoutBookmarkAndInfoBars(int top, int browser_view_y);
124 int LayoutBookmarkBar(int top); 124 int LayoutBookmarkBar(int top);
125 int LayoutInfoBar(int top); 125 int LayoutInfoBar(int top);
126 126
127 // Layout the |contents_split_| view between the coordinates |top| and 127 // Layout the |contents_split_| view between the coordinates |top| and
128 // |bottom|. See browser_view.h for details of the relationship between 128 // |bottom|. See browser_view.h for details of the relationship between
129 // |contents_split_| and other views. 129 // |contents_split_| and other views.
130 void LayoutContentsSplitView(int top, int bottom); 130 void LayoutContentsSplitView(int top, int bottom);
131 131
132 // Layout the |overlay_container_| view below the toolbar. 132 // Layout the |overlay_container_| view below the toolbar.
133 void LayoutOverlayContainer(); 133 void LayoutOverlayContainer();
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 scoped_ptr<WebContentsModalDialogHostViews> dialog_host_; 192 scoped_ptr<WebContentsModalDialogHostViews> dialog_host_;
193 193
194 // The distance the web contents modal dialog is from the top of the window, 194 // The distance the web contents modal dialog is from the top of the window,
195 // in pixels. 195 // in pixels.
196 int web_contents_modal_dialog_top_y_; 196 int web_contents_modal_dialog_top_y_;
197 197
198 DISALLOW_COPY_AND_ASSIGN(BrowserViewLayout); 198 DISALLOW_COPY_AND_ASSIGN(BrowserViewLayout);
199 }; 199 };
200 200
201 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_LAYOUT_H_ 201 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_LAYOUT_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/frame/browser_view_layout.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698