diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-03 15:42:46 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-03 15:42:46 +0000 |
| commit | 9f2ea8764277f52936b65136322a97f1d92a7fa9 (patch) | |
| tree | b2fac198048fd0b3d9f5b7a5a63870b967ed8999 /views/window/non_client_view.h | |
| parent | 6eecccb5ea44d7a55fac158ae6b6d6dff9b33321 (diff) | |
| download | chromium_src-9f2ea8764277f52936b65136322a97f1d92a7fa9.zip chromium_src-9f2ea8764277f52936b65136322a97f1d92a7fa9.tar.gz chromium_src-9f2ea8764277f52936b65136322a97f1d92a7fa9.tar.bz2 | |
Re-land: 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@87784 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 0127d8b..395ec18 100644 --- a/views/window/non_client_view.h +++ b/views/window/non_client_view.h @@ -130,7 +130,7 @@ class NonClientFrameView : public View { // class NonClientView : public View { public: - explicit NonClientView(Window* frame); + NonClientView(); virtual ~NonClientView(); // Returns the current NonClientFrameView instance, or NULL if @@ -213,9 +213,6 @@ class NonClientView : public View { OVERRIDE; private: - // The frame that hosts this NonClientView. - Window* frame_; - // A ClientView object or subclass, responsible for sizing the contents view // of the window, hit testing and perhaps other tasks depending on the // implementation. |