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

Unified Diff: views/widget/widget_win.cc

Issue 6975037: Revert 85666 - 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
« no previous file with comments | « chrome/common/chrome_switches.cc ('k') | views/window/native_window_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/widget/widget_win.cc
===================================================================
--- views/widget/widget_win.cc (revision 85701)
+++ views/widget/widget_win.cc (working copy)
@@ -564,8 +564,7 @@
// 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.
- Window* window = GetWidget()->GetContainingWindow();
- if (window && window->ShouldUseNativeFrame()) {
+ if (GetWidget()->GetThemeProvider()->ShouldUseNativeFrame()) {
tooltip_manager_.reset(new AeroTooltipManager(GetWidget()));
} else {
tooltip_manager_.reset(new TooltipManagerWin(GetWidget()));
@@ -1107,8 +1106,7 @@
void WidgetWin::ClientAreaSizeChanged() {
RECT r;
- Window* window = GetWidget()->GetContainingWindow();
- if (IsZoomed() || (window && window->ShouldUseNativeFrame()))
+ if (GetWidget()->GetThemeProvider()->ShouldUseNativeFrame() || IsZoomed())
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 »

Powered by Google App Engine
This is Rietveld 408576698