| 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" | |
| 11 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" | 10 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" |
| 12 #include "chrome/browser/ui/views/frame/browser_view_layout.h" | 11 #include "chrome/browser/ui/views/frame/browser_view_layout.h" |
| 13 #include "chrome/browser/ui/views/frame/test_with_browser_view.h" | 12 #include "chrome/browser/ui/views/frame/test_with_browser_view.h" |
| 14 #include "chrome/browser/ui/views/frame/top_container_view.h" | 13 #include "chrome/browser/ui/views/frame/top_container_view.h" |
| 15 #include "chrome/browser/ui/views/infobars/infobar_container_view.h" | 14 #include "chrome/browser/ui/views/infobars/infobar_container_view.h" |
| 16 #include "chrome/browser/ui/views/tabs/tab_strip.h" | 15 #include "chrome/browser/ui/views/tabs/tab_strip.h" |
| 17 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" | 16 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" |
| 18 #include "chrome/common/url_constants.h" | 17 #include "chrome/common/url_constants.h" |
| 19 #include "ui/base/accelerators/accelerator.h" | 18 #include "ui/base/accelerators/accelerator.h" |
| 20 #include "ui/views/controls/webview/webview.h" | 19 #include "ui/views/controls/webview/webview.h" |
| (...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 221 header_offset.y(); | 220 header_offset.y(); |
| 222 | 221 |
| 223 // The web contents should be flush with the bottom of the header. | 222 // The web contents should be flush with the bottom of the header. |
| 224 EXPECT_EQ(bottom_of_header, contents_container->y()); | 223 EXPECT_EQ(bottom_of_header, contents_container->y()); |
| 225 | 224 |
| 226 // The find bar should overlap the 1px header/web-contents separator at the | 225 // The find bar should overlap the 1px header/web-contents separator at the |
| 227 // bottom of the header. | 226 // bottom of the header. |
| 228 EXPECT_LT(browser_view()->GetFindBarBoundingBox().y(), | 227 EXPECT_LT(browser_view()->GetFindBarBoundingBox().y(), |
| 229 browser_view()->frame()->GetTopInset(false)); | 228 browser_view()->frame()->GetTopInset(false)); |
| 230 } | 229 } |
| OLD | NEW |