chrome/browser/ui/views/frame/opaque_browser_frame_view.cc - Issue 1869163003: Refactored GlassBrowserFrameView and BrowserDesktopTreeHostWin.

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/opaque_browser_frame_view.cc

Issue 1869163003: Refactored GlassBrowserFrameView and BrowserDesktopTreeHostWin. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix merge error Created 4 years, 8 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/frame/glass_browser_frame_view.cc ('k') | chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index f9cfccafac849e4aa4dc0a587bce4988ce3a9f06..ae4b53f7664c4bd3987294113b3bdfcc819602ce 100644

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

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

@@ -153,9 +153,9 @@ gfx::Rect OpaqueBrowserFrameView::GetBoundsForTabStrip(

}

int OpaqueBrowserFrameView::GetTopInset(bool restored) const {

- return browser_view()->IsTabStripVisible() ?

- layout_->GetTabStripInsetsTop(restored) :

- layout_->NonClientTopBorderHeight(restored);

+ return browser_view()->IsTabStripVisible()

+ ? layout_->GetTabStripInsetsTop(restored)

+ : layout_->NonClientTopHeight(restored);

}

int OpaqueBrowserFrameView::GetThemeBackgroundXInset() const {