diff options
| author | glen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-31 07:39:29 +0000 |
|---|---|---|
| committer | glen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-31 07:39:29 +0000 |
| commit | 86681b9dccc5d4ea00d5f767f0e9bf417c618cc9 (patch) | |
| tree | c1eada026dcccecd2163ce62d1e1472bce267610 /chrome/browser/views/frame | |
| parent | 878ae96bea0bb797e2a47b7a685c56cb6b5601d0 (diff) | |
| download | chromium_src-86681b9dccc5d4ea00d5f767f0e9bf417c618cc9.zip chromium_src-86681b9dccc5d4ea00d5f767f0e9bf417c618cc9.tar.gz chromium_src-86681b9dccc5d4ea00d5f767f0e9bf417c618cc9.tar.bz2 | |
Use the right frame type on startup, do proper swapping of frames when themes change. Leave the native frame decision up to the ThemeProvider.
BUG=12890
TEST=In Aero, unstall a theme, reset to default, install again, restart, reset theme to default. Make sure that the Aero frame changes to the themed frame and back again appropriately.
Review URL: http://codereview.chromium.org/118053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17301 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/frame')
| -rw-r--r-- | chrome/browser/views/frame/browser_frame_win.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/views/frame/browser_view.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/views/frame/browser_frame_win.cc b/chrome/browser/views/frame/browser_frame_win.cc index 505f28b..3e9d8d7 100644 --- a/chrome/browser/views/frame/browser_frame_win.cc +++ b/chrome/browser/views/frame/browser_frame_win.cc @@ -235,7 +235,7 @@ int BrowserFrameWin::GetShowState() const { } views::NonClientFrameView* BrowserFrameWin::CreateFrameViewForWindow() { - if (GetNonClientView()->UseNativeFrame()) + if (GetThemeProvider()->ShouldUseNativeFrame()) browser_frame_view_ = new GlassBrowserFrameView(this, browser_view_); else browser_frame_view_ = new OpaqueBrowserFrameView(this, browser_view_); diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc index ac9201d..e7ffef4 100644 --- a/chrome/browser/views/frame/browser_view.cc +++ b/chrome/browser/views/frame/browser_view.cc @@ -880,7 +880,7 @@ void BrowserView::ShowHTMLDialog(HtmlDialogUIDelegate* delegate, } void BrowserView::UserChangedTheme() { - frame_->GetWindow()->GetNonClientView()->SetUseNativeFrame(false); + frame_->GetWindow()->FrameTypeChanged(); GetRootView()->ThemeChanged(); GetRootView()->SchedulePaint(); } |