OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #include "chrome/browser/ui/views/frame/browser_view.h" | 5 #include "chrome/browser/ui/views/frame/browser_view.h" |
6 | 6 |
7 #include "chrome/app/chrome_command_ids.h" | 7 #include "chrome/app/chrome_command_ids.h" |
8 #include "chrome/browser/ui/browser_commands.h" | 8 #include "chrome/browser/ui/browser_commands.h" |
9 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" | 9 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" |
10 #include "chrome/browser/ui/views/frame/browser_view_layout.h" | 10 #include "chrome/browser/ui/views/frame/browser_view_layout.h" |
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
186 EXPECT_FALSE(browser_view()->IsBookmarkBarVisible()); | 186 EXPECT_FALSE(browser_view()->IsBookmarkBarVisible()); |
187 | 187 |
188 gfx::Point header_offset; | 188 gfx::Point header_offset; |
189 views::View::ConvertPointToTarget( | 189 views::View::ConvertPointToTarget( |
190 browser_view(), | 190 browser_view(), |
191 browser_view()->frame()->non_client_view()->frame_view(), | 191 browser_view()->frame()->non_client_view()->frame_view(), |
192 &header_offset); | 192 &header_offset); |
193 | 193 |
194 // The position of the bottom of the header (the bar with the window | 194 // The position of the bottom of the header (the bar with the window |
195 // controls) in the coordinates of BrowserView. | 195 // controls) in the coordinates of BrowserView. |
196 int bottom_of_header = browser_view()->frame()->GetTopInset() - | 196 int bottom_of_header = browser_view()->frame()->GetTopInset(false) - |
197 header_offset.y(); | 197 header_offset.y(); |
198 | 198 |
199 // The web contents should be flush with the bottom of the header. | 199 // The web contents should be flush with the bottom of the header. |
200 EXPECT_EQ(bottom_of_header, contents_container->y()); | 200 EXPECT_EQ(bottom_of_header, contents_container->y()); |
201 | 201 |
202 // The find bar should overlap the 1px header/web-contents separator at the | 202 // The find bar should overlap the 1px header/web-contents separator at the |
203 // bottom of the header. | 203 // bottom of the header. |
204 EXPECT_LT(browser_view()->GetFindBarBoundingBox().y(), | 204 EXPECT_LT(browser_view()->GetFindBarBoundingBox().y(), |
205 browser_view()->frame()->GetTopInset()); | 205 browser_view()->frame()->GetTopInset(false)); |
206 } | 206 } |
OLD | NEW |