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

Unified Diff: chrome/browser/ui/views/frame/browser_view_layout.cc

Issue 1395193002: Fixes BrowserViewHostedAppTest.Layout when using MD (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes BrowserViewHostedAppTest.Layout when using MD (post-LGTM comments) Created 5 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/views/frame/browser_view_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/frame/browser_view_layout.cc
diff --git a/chrome/browser/ui/views/frame/browser_view_layout.cc b/chrome/browser/ui/views/frame/browser_view_layout.cc
index a8d1c71940db9671eecdc80bc6967ea6f9f824b6..25e1df6b6d8d3b6e3c148714c50aaaf04886a159 100644
--- a/chrome/browser/ui/views/frame/browser_view_layout.cc
+++ b/chrome/browser/ui/views/frame/browser_view_layout.cc
@@ -223,13 +223,12 @@ gfx::Rect BrowserViewLayout::GetFindBarBoundingBox() const {
// miniature immersive style tab strip is visible. Do not overlap the
// find bar and the tab strip.
find_bar_y = top_container_bounds.bottom();
- } else if (ui::MaterialDesignController::IsModeMaterial()) {
- find_bar_y = top_container_bounds.bottom() - 6;
} else {
- // Position the find bar 1 pixel above the bottom of the top container
- // so that it occludes the border between the content area and the top
- // container and looks connected to the top container.
- find_bar_y = top_container_bounds.bottom() - 1;
+ // Overlap the find bar atop |top_container_|.
+ // The find bar should look connected to the top container when material
+ // design is not enabled.
+ find_bar_y = top_container_bounds.bottom() -
+ GetLayoutConstant(FIND_BAR_TOOLBAR_OVERLAP);
}
// Grow the height of |bounding_box| by the height of any elements between
« no previous file with comments | « no previous file | chrome/browser/ui/views/frame/browser_view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698