summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorglen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-04 19:59:08 +0000
committerglen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-04 19:59:08 +0000
commit7ab548abee35d69a9d3475ab7eaff0db157df7a8 (patch)
tree30d51b1cc2ced7e4c96ef12683b1ff743caecbc2 /chrome
parent7c616731ac7cd2cf542a3d41078f7b9c6dc869bd (diff)
downloadchromium_src-7ab548abee35d69a9d3475ab7eaff0db157df7a8.zip
chromium_src-7ab548abee35d69a9d3475ab7eaff0db157df7a8.tar.gz
chromium_src-7ab548abee35d69a9d3475ab7eaff0db157df7a8.tar.bz2
Fix for DWM crash.
BUG=13075 TBR=ben TEST=On XP, verify that Chrome doesn't crash when a theme is installed or reset. Review URL: http://codereview.chromium.org/118252 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17652 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/views/frame/browser_frame_win.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/views/frame/browser_frame_win.cc b/chrome/browser/views/frame/browser_frame_win.cc
index 3e9d8d7..5e311c7 100644
--- a/chrome/browser/views/frame/browser_frame_win.cc
+++ b/chrome/browser/views/frame/browser_frame_win.cc
@@ -257,7 +257,8 @@ views::RootView* BrowserFrameWin::CreateRootView() {
void BrowserFrameWin::UpdateDWMFrame() {
// Nothing to do yet.
- if (!GetClientView() || !browser_view_->IsBrowserTypeNormal())
+ if (!GetClientView() || !browser_view_->IsBrowserTypeNormal() ||
+ !win_util::ShouldUseVistaFrame())
return;
// In fullscreen mode, we don't extend glass into the client area at all,