diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-18 15:15:59 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-18 15:15:59 +0000 |
| commit | cdc05ec939773ef32e249d43b6f7393ee985d1fe (patch) | |
| tree | f8229612e46e8e0e8518122aa84f0725fd521ff2 /views/widget | |
| parent | d5d1ad4336d7d8ada639f868088d6dca70674def (diff) | |
| download | chromium_src-cdc05ec939773ef32e249d43b6f7393ee985d1fe.zip chromium_src-cdc05ec939773ef32e249d43b6f7393ee985d1fe.tar.gz chromium_src-cdc05ec939773ef32e249d43b6f7393ee985d1fe.tar.bz2 | |
Re-land:
Consolidate ShouldUseNativeFrame/AlwaysUseNativeFrame/UseNativeFrame spaghetti. See earlier commit in log for full description.
THIS WILL BREAK chrome_frame_tests!
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7036011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85765 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/widget')
| -rw-r--r-- | views/widget/widget_win.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/views/widget/widget_win.cc b/views/widget/widget_win.cc index 65e2e77..353fe4b 100644 --- a/views/widget/widget_win.cc +++ b/views/widget/widget_win.cc @@ -564,7 +564,8 @@ LRESULT WidgetWin::OnCreate(CREATESTRUCT* create_struct) { // 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::RedrawLayeredWindowContents() { void WidgetWin::ClientAreaSizeChanged() { RECT r; - if (GetWidget()->GetThemeProvider()->ShouldUseNativeFrame() || IsZoomed()) + Window* window = GetWidget()->GetContainingWindow(); + if (IsZoomed() || (window && window->ShouldUseNativeFrame())) GetClientRect(&r); else GetWindowRect(&r); |