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 "base/macros.h" | 7 #include "base/macros.h" |
8 #include "chrome/app/chrome_command_ids.h" | 8 #include "chrome/app/chrome_command_ids.h" |
9 #include "chrome/browser/ui/browser_commands.h" | 9 #include "chrome/browser/ui/browser_commands.h" |
10 #include "chrome/browser/ui/layout_constants.h" | 10 #include "chrome/browser/ui/layout_constants.h" |
11 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" | 11 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" |
12 #include "chrome/browser/ui/views/frame/browser_view_layout.h" | 12 #include "chrome/browser/ui/views/frame/browser_view_layout.h" |
13 #include "chrome/browser/ui/views/frame/test_with_browser_view.h" | 13 #include "chrome/browser/ui/views/frame/test_with_browser_view.h" |
14 #include "chrome/browser/ui/views/frame/top_container_view.h" | 14 #include "chrome/browser/ui/views/frame/top_container_view.h" |
15 #include "chrome/browser/ui/views/infobars/infobar_container_view.h" | 15 #include "chrome/browser/ui/views/infobars/infobar_container_view.h" |
16 #include "chrome/browser/ui/views/tabs/tab_strip.h" | 16 #include "chrome/browser/ui/views/tabs/tab_strip.h" |
17 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" | 17 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" |
18 #include "chrome/common/url_constants.h" | 18 #include "chrome/common/url_constants.h" |
19 #include "ui/views/controls/single_split_view.h" | |
20 #include "ui/views/controls/webview/webview.h" | 19 #include "ui/views/controls/webview/webview.h" |
21 | 20 |
22 namespace { | 21 namespace { |
23 | 22 |
24 // Tab strip bounds depend on the window frame sizes. | 23 // Tab strip bounds depend on the window frame sizes. |
25 gfx::Point ExpectedTabStripOrigin(BrowserView* browser_view) { | 24 gfx::Point ExpectedTabStripOrigin(BrowserView* browser_view) { |
26 gfx::Rect tabstrip_bounds( | 25 gfx::Rect tabstrip_bounds( |
27 browser_view->frame()->GetBoundsForTabStrip(browser_view->tabstrip())); | 26 browser_view->frame()->GetBoundsForTabStrip(browser_view->tabstrip())); |
28 gfx::Point tabstrip_origin(tabstrip_bounds.origin()); | 27 gfx::Point tabstrip_origin(tabstrip_bounds.origin()); |
29 views::View::ConvertPointToTarget(browser_view->parent(), | 28 views::View::ConvertPointToTarget(browser_view->parent(), |
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
198 header_offset.y(); | 197 header_offset.y(); |
199 | 198 |
200 // 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. |
201 EXPECT_EQ(bottom_of_header, contents_container->y()); | 200 EXPECT_EQ(bottom_of_header, contents_container->y()); |
202 | 201 |
203 // 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 |
204 // bottom of the header. | 203 // bottom of the header. |
205 EXPECT_LT(browser_view()->GetFindBarBoundingBox().y(), | 204 EXPECT_LT(browser_view()->GetFindBarBoundingBox().y(), |
206 browser_view()->frame()->GetTopInset(false)); | 205 browser_view()->frame()->GetTopInset(false)); |
207 } | 206 } |
OLD | NEW |