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 /views/window/non_client_view.h | |
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 'views/window/non_client_view.h')
-rw-r--r-- | views/window/non_client_view.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/views/window/non_client_view.h b/views/window/non_client_view.h index 847f604..6ac38ac 100644 --- a/views/window/non_client_view.h +++ b/views/window/non_client_view.h @@ -139,7 +139,7 @@ class NonClientView : public View { // Changes the frame from native to custom depending on the value of // |use_native_frame|. - void SetUseNativeFrame(bool use_native_frame); + void UpdateFrame(); // Returns true if the native window frame should be used, false if the // NonClientView provides its own frame implementation. @@ -214,9 +214,6 @@ class NonClientView : public View { // dynamically as the system settings change. scoped_ptr<NonClientFrameView> frame_view_; - // Whether or not we should use the native frame. - bool use_native_frame_; - DISALLOW_COPY_AND_ASSIGN(NonClientView); }; |