views/widget/widget_win.cc - Issue 7036014: Consolidate ShouldUseNativeFrame/AlwaysUseNativeFrame/UseNativeFrame spaghetti.

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: views/widget/widget_win.cc

Issue 7036014: Consolidate ShouldUseNativeFrame/AlwaysUseNativeFrame/UseNativeFrame spaghetti. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 9 years, 7 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

Index: views/widget/widget_win.cc

===================================================================

--- views/widget/widget_win.cc (revision 85647)

+++ views/widget/widget_win.cc (working copy)

@@ -564,7 +564,8 @@

// Windows special DWM window frame requires a special tooltip manager so

// that window controls in Chrome windows don't flicker when you move your

// mouse over them. See comment in aero_tooltip_manager.h.

- if (GetWidget()->GetThemeProvider()->ShouldUseNativeFrame()) {

+ Window* window = GetWidget()->GetContainingWindow();

+ if (window && window->ShouldUseNativeFrame()) {

tooltip_manager_.reset(new AeroTooltipManager(GetWidget()));

} else {

tooltip_manager_.reset(new TooltipManagerWin(GetWidget()));

@@ -1106,7 +1107,8 @@

void WidgetWin::ClientAreaSizeChanged() {

RECT r;

- if (GetWidget()->GetThemeProvider()->ShouldUseNativeFrame() || IsZoomed())

+ Window* window = GetWidget()->GetContainingWindow();

+ if (IsZoomed() || (window && window->ShouldUseNativeFrame()))

GetClientRect(&r);

else

GetWindowRect(&r);

« no previous file with comments | « chrome/common/chrome_switches.cc ('k') | views/window/native_window_delegate.h » ('j') | no next file with comments »