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

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

Issue 1270783005: V1 of material design find in page bar (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: suffixual f Created 5 years, 4 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 | « chrome/browser/ui/views/find_bar_view.cc ('k') | ui/gfx/BUILD.gn » ('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 11405f665fd034f4cfd4a24aec7c35e7a7b95a0a..fbac465dae37def6cc4c4704ad3e8d12321fdb4d 100644
--- a/chrome/browser/ui/views/frame/browser_view_layout.cc
+++ b/chrome/browser/ui/views/frame/browser_view_layout.cc
@@ -23,6 +23,7 @@
#include "chrome/browser/ui/views/tabs/tab_strip.h"
#include "components/web_modal/web_contents_modal_dialog_host.h"
#include "ui/base/hit_test.h"
+#include "ui/base/resource/material_design/material_design_controller.h"
#include "ui/gfx/geometry/point.h"
#include "ui/gfx/geometry/size.h"
#include "ui/gfx/scrollbar_size.h"
@@ -224,6 +225,8 @@ 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
« no previous file with comments | « chrome/browser/ui/views/find_bar_view.cc ('k') | ui/gfx/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698