diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-02 22:07:05 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-02 22:07:05 +0000 |
| commit | 14bcec307d7ec6b13e90fe5e5ac8ca5aaa397b4b (patch) | |
| tree | 7c88cf92588f0d99a38757f52cc92b47f7e053ef /views/window/native_frame_view.cc | |
| parent | 6b8b0f08cfebb37c13f6c835c37d9ed9e982fc37 (diff) | |
| download | chromium_src-14bcec307d7ec6b13e90fe5e5ac8ca5aaa397b4b.zip chromium_src-14bcec307d7ec6b13e90fe5e5ac8ca5aaa397b4b.tar.gz chromium_src-14bcec307d7ec6b13e90fe5e5ac8ca5aaa397b4b.tar.bz2 | |
Move NonClientView and FrameType logic from Window to Widget.
Also fixes leak of default WidgetDelegate by replacing it with a DefaultWidgetDelegate subclass that overrides DeleteDelegate and deletes itself. This required moving the destruction logic from Window down onto Widget.
BUG=72040
TEST=none
Review URL: http://codereview.chromium.org/7033049
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87702 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/window/native_frame_view.cc')
| -rw-r--r-- | views/window/native_frame_view.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/views/window/native_frame_view.cc b/views/window/native_frame_view.cc index 55906ba..752bdec1f 100644 --- a/views/window/native_frame_view.cc +++ b/views/window/native_frame_view.cc @@ -4,16 +4,16 @@ #include "views/window/native_frame_view.h" +#include "views/widget/native_widget.h" #include "views/widget/native_widget_win.h" -#include "views/window/native_window.h" -#include "views/window/window.h" +#include "views/widget/widget.h" namespace views { //////////////////////////////////////////////////////////////////////////////// // NativeFrameView, public: -NativeFrameView::NativeFrameView(Window* frame) +NativeFrameView::NativeFrameView(Widget* frame) : NonClientFrameView(), frame_(frame) { } @@ -32,7 +32,7 @@ gfx::Rect NativeFrameView::GetWindowBoundsForClientBounds( const gfx::Rect& client_bounds) const { RECT rect = client_bounds.ToRECT(); NativeWidgetWin* widget_win = - static_cast<NativeWidgetWin*>(frame_->native_window()->AsNativeWidget()); + static_cast<NativeWidgetWin*>(frame_->native_widget()); AdjustWindowRectEx(&rect, widget_win->window_style(), FALSE, widget_win->window_ex_style()); return gfx::Rect(rect); |