diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-08 17:47:43 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-08 17:47:43 +0000 |
| commit | 68c477df6917633a7a9c64f8624446ca0bd895d5 (patch) | |
| tree | a270354aa75de9516ba5b150568bb1d142b24b1c /views/widget/widget_delegate.cc | |
| parent | 8a9c6c3401524c0a4b5d37d65335e9124885305a (diff) | |
| download | chromium_src-68c477df6917633a7a9c64f8624446ca0bd895d5.zip chromium_src-68c477df6917633a7a9c64f8624446ca0bd895d5.tar.gz chromium_src-68c477df6917633a7a9c64f8624446ca0bd895d5.tar.bz2 | |
Move more from Window onto Widget.
BUG=72040
TEST=none
Review URL: http://codereview.chromium.org/7054052
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88356 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/widget/widget_delegate.cc')
| -rw-r--r-- | views/widget/widget_delegate.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/views/widget/widget_delegate.cc b/views/widget/widget_delegate.cc index e63cbbb..f58e891 100644 --- a/views/widget/widget_delegate.cc +++ b/views/widget/widget_delegate.cc @@ -99,7 +99,6 @@ std::wstring WidgetDelegate::GetWindowName() const { void WidgetDelegate::SaveWindowPlacement(const gfx::Rect& bounds, bool maximized) { - DCHECK(window_); std::wstring window_name = GetWindowName(); if (!ViewsDelegate::views_delegate || window_name.empty()) return; @@ -133,11 +132,11 @@ bool WidgetDelegate::ShouldRestoreWindowSize() const { } View* WidgetDelegate::GetContentsView() { - return NULL; + return new View; } -ClientView* WidgetDelegate::CreateClientView(Window* window) { - return new ClientView(window, GetContentsView()); +ClientView* WidgetDelegate::CreateClientView(Widget* widget) { + return new ClientView(widget, GetContentsView()); } NonClientFrameView* WidgetDelegate::CreateNonClientFrameView() { |