summaryrefslogtreecommitdiffstats
path: root/views
diff options
context:
space:
mode:
authorglen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-03 18:22:41 +0000
committerglen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-03 18:22:41 +0000
commit4a4fcb15e4f3d69517ef93694eda0800e8052900 (patch)
treef350fded31b5e2baaa6599772e8e8699831b2c40 /views
parent385967fc796c6cd98ba62c3607f2e1287e4b7fa9 (diff)
downloadchromium_src-4a4fcb15e4f3d69517ef93694eda0800e8052900.zip
chromium_src-4a4fcb15e4f3d69517ef93694eda0800e8052900.tar.gz
chromium_src-4a4fcb15e4f3d69517ef93694eda0800e8052900.tar.bz2
Fix for crash when changing frame on non-DWM systems.
BUG=13075 TEST=Reset the theme on XP and verify that it doesn't crash. Review URL: http://codereview.chromium.org/118171 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17503 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
-rw-r--r--views/window/window_win.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/views/window/window_win.cc b/views/window/window_win.cc
index 3759851..6b9f5d8 100644
--- a/views/window/window_win.cc
+++ b/views/window/window_win.cc
@@ -191,6 +191,13 @@ static BOOL CALLBACK SendDwmCompositionChanged(HWND window, LPARAM param) {
} // namespace
void WindowWin::FrameTypeChanged() {
+ // If we're not on Aero Glass, we don't care doing any of the DWM stuff. Just
+ // tell the NCV to update and leave it there.
+ if (!win_util::ShouldUseVistaFrame()) {
+ non_client_view_->UpdateFrame();
+ return;
+ }
+
// The window may try to paint in SetUseNativeFrame, and as a result it can
// get into a state where it is very unhappy with itself - rendering black
// behind the entire client area. This is because for some reason the