chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc - Issue 1505223004: Do not use assets for Ash window control button backgrounds

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1505223004: Do not use assets for Ash window control button backgrounds (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: for owners review Created 4 years, 12 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

« ash/frame/caption_buttons/frame_caption_button.cc ('K') | « chrome/browser/ui/views/frame/browser_header_painter_ash.cc ('k') | chrome/browser/ui/views/frame/web_app_left_header_view_ash.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc

diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc

index 5349b06313dab595a9bc1380fc8283cf11f54214..ffefd3ce4f0e520293533d730b967a122bd0e454 100644

--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc

+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc

@@ -177,6 +177,14 @@ int BrowserNonClientFrameViewAsh::GetTopInset(bool restored) const {

return 0;

if (browser_view()->IsTabStripVisible()) {

+ // TODO(tdanderson): Remove this temporary hack to prevent the buttons in

+ // the header from overlapping the tabstrip/toolbar

+ // separator in material design.

+ if (ui::MaterialDesignController::IsModeMaterial()) {

+ return header_painter_->GetHeaderHeight() -

+ browser_view()->GetTabStripHeight();

+ }

return ((frame()->IsMaximized() || frame()->IsFullscreen()) && !restored) ?

kTabstripTopSpacingShort : kTabstripTopSpacingTall;

}