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

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

Issue 14230025: Make the relationship between the find bar position and the top container height more obvious (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 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) 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 } 54 }
55 void set_download_shelf(DownloadShelfView* download_shelf) { 55 void set_download_shelf(DownloadShelfView* download_shelf) {
56 download_shelf_ = download_shelf; 56 download_shelf_ = download_shelf;
57 } 57 }
58 58
59 WebContentsModalDialogHost* GetWebContentsModalDialogHost(); 59 WebContentsModalDialogHost* GetWebContentsModalDialogHost();
60 60
61 // Returns the minimum size of the browser view. 61 // Returns the minimum size of the browser view.
62 gfx::Size GetMinimumSize(); 62 gfx::Size GetMinimumSize();
63 63
64 // Returns the bounding box for the find bar. 64 // Returns the bounding box, in widget coordinates, for the find bar.
65 gfx::Rect GetFindBarBoundingBox() const; 65 gfx::Rect GetFindBarBoundingBox() const;
66 66
67 // Returns true if the specified point(BrowserView coordinates) is in 67 // Returns true if the specified point(BrowserView coordinates) is in
68 // in the window caption area of the browser window. 68 // in the window caption area of the browser window.
69 bool IsPositionInWindowCaption(const gfx::Point& point); 69 bool IsPositionInWindowCaption(const gfx::Point& point);
70 70
71 // Tests to see if the specified |point| (in nonclient view's coordinates) 71 // Tests to see if the specified |point| (in nonclient view's coordinates)
72 // is within the views managed by the laymanager. Returns one of 72 // is within the views managed by the laymanager. Returns one of
73 // HitTestCompat enum defined in ui/base/hit_test.h. 73 // HitTestCompat enum defined in ui/base/hit_test.h.
74 // See also ClientView::NonClientHitTest. 74 // See also ClientView::NonClientHitTest.
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 views::SingleSplitView* contents_split_; 152 views::SingleSplitView* contents_split_;
153 ContentsContainer* contents_container_; 153 ContentsContainer* contents_container_;
154 DownloadShelfView* download_shelf_; 154 DownloadShelfView* download_shelf_;
155 155
156 // The bounds within which the vertically-stacked contents of the BrowserView 156 // The bounds within which the vertically-stacked contents of the BrowserView
157 // should be laid out within. This is just the local bounds of the 157 // should be laid out within. This is just the local bounds of the
158 // BrowserView. 158 // BrowserView.
159 // TODO(jamescook): Remove this and just use browser_view_->GetLocalBounds(). 159 // TODO(jamescook): Remove this and just use browser_view_->GetLocalBounds().
160 gfx::Rect vertical_layout_rect_; 160 gfx::Rect vertical_layout_rect_;
161 161
162 // The distance the FindBar is from the top of the window, in pixels.
163 int find_bar_y_;
164
165 // The host for use in positioning the web contents modal dialog. 162 // The host for use in positioning the web contents modal dialog.
166 scoped_ptr<WebContentsModalDialogHostViews> dialog_host_; 163 scoped_ptr<WebContentsModalDialogHostViews> dialog_host_;
167 164
168 // The distance the web contents modal dialog is from the top of the window, 165 // The distance the web contents modal dialog is from the top of the window,
169 // in pixels. 166 // in pixels.
170 int web_contents_modal_dialog_top_y_; 167 int web_contents_modal_dialog_top_y_;
171 168
172 DISALLOW_COPY_AND_ASSIGN(BrowserViewLayout); 169 DISALLOW_COPY_AND_ASSIGN(BrowserViewLayout);
173 }; 170 };
174 171
175 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_LAYOUT_H_ 172 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_LAYOUT_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/find_bar_host.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