summaryrefslogtreecommitdiffstats
path: root/chrome/views/custom_frame_window.cc
diff options
context:
space:
mode:
authorbeng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-05 00:06:22 +0000
committerbeng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-05 00:06:22 +0000
commitee0b38b16afa0a6d1cfd07df66ec67cee8bac6c8 (patch)
tree558132c0345c91f5b73c0ea03db2b1ce60ce7d69 /chrome/views/custom_frame_window.cc
parent4ae627586ecb6184c3b766fd5128709442b17360 (diff)
downloadchromium_src-ee0b38b16afa0a6d1cfd07df66ec67cee8bac6c8.zip
chromium_src-ee0b38b16afa0a6d1cfd07df66ec67cee8bac6c8.tar.gz
chromium_src-ee0b38b16afa0a6d1cfd07df66ec67cee8bac6c8.tar.bz2
Add the AeroGlassFrame and AeroGlassNonClientView for Vista.
Note that AeroGlassFrame needs a NonClientView as well - even though Windows draws most of the frame and its borders, we do some custom rendering in the non-client area, such as the distributor logo, the client edge and toolbar backgrounds. This necessitated allowing Window to support an optional NonClientView. I just jimmied this in for now... can clean up that API later if desired. B=1031854 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@352 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/views/custom_frame_window.cc')
-rw-r--r--chrome/views/custom_frame_window.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/views/custom_frame_window.cc b/chrome/views/custom_frame_window.cc
index 928947e..0acf4b3 100644
--- a/chrome/views/custom_frame_window.cc
+++ b/chrome/views/custom_frame_window.cc
@@ -833,16 +833,16 @@ void DefaultNonClientView::InitClass() {
CustomFrameWindow::CustomFrameWindow(WindowDelegate* window_delegate)
: Window(window_delegate),
- non_client_view_(new DefaultNonClientView(this)),
is_active_(false) {
InitClass();
+ non_client_view_ = new DefaultNonClientView(this);
}
CustomFrameWindow::CustomFrameWindow(WindowDelegate* window_delegate,
NonClientView* non_client_view)
- : Window(window_delegate),
- non_client_view_(non_client_view) {
+ : Window(window_delegate) {
InitClass();
+ non_client_view_ = non_client_view;
}
CustomFrameWindow::~CustomFrameWindow() {