Fixes BrowserViewHostedAppTest.Layout when using MD

chrome/browser/ui/views/frame/browser_view_layout.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/frame/browser_view_layout.h"
 
 #include "base/observer_list.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
@@ skipping 205 matching lines @@
       top_container_->GetLocalBounds());
 
   int find_bar_y = 0;
   if (immersive_mode_controller_->IsEnabled() &&
       !immersive_mode_controller_->IsRevealed()) {
     // Position the find bar exactly below the top container. In immersive
     // fullscreen, when the top-of-window views are not revealed, only the
     // 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;
+    // Position the find bar above the bottom of the top container so that it
+    // occludes the border between the content area and the 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_VERTICAL_OFFSET);

[Peter Kasting, 2015/10/09 22:15:06]

It seems like this is more an "overlap" value than an "offset"?  Maybe
"FIND_BAR_TOOLBAR_OVERLAP"?  (I realize "toolbar" is a little overly-specific,
but it's roughly accurate, and "TOP_CONTAINER" is too vague in
layout_constants.h.)

Then maybe the comment can just be "Overlap the find bar atop |top_container_|."

[varkha, 2015/10/13 14:51:13]

Done. I've left the part about connected look when MD is not enabled, that
seemed like an important detail for now that is not easily read from code.

   }
 
   // Grow the height of |bounding_box| by the height of any elements between
   // the top container and |contents_container_| such as the detached bookmark
   // bar and any infobars.
   int height_delta = bounding_box.y() - find_bar_y;
   bounding_box.set_y(find_bar_y);
   bounding_box.set_height(std::max(0, bounding_box.height() + height_delta));
 
   // Finally decrease the width of the bounding box by the width of
@@ skipping 298 matching lines @@
   return bottom;
 }
 
 bool BrowserViewLayout::InfobarVisible() const {
   // Cast to a views::View to access GetPreferredSize().
   views::View* infobar_container = infobar_container_;
   // NOTE: Can't check if the size IsEmpty() since it's always 0-width.
   return browser_->SupportsWindowFeature(Browser::FEATURE_INFOBAR) &&
       (infobar_container->GetPreferredSize().height() != 0);
 }