diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-02 15:09:39 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-02 15:09:39 +0000 |
| commit | b6b53155952432917e19b69eaa1040c4f1d6cb96 (patch) | |
| tree | 90f3b6783221c587f7f72691c0b8ff61dc991a9e /views/window | |
| parent | d4ae5794b83ca02e76a5f527ca7ac8a2fdf16d10 (diff) | |
| download | chromium_src-b6b53155952432917e19b69eaa1040c4f1d6cb96.zip chromium_src-b6b53155952432917e19b69eaa1040c4f1d6cb96.tar.gz chromium_src-b6b53155952432917e19b69eaa1040c4f1d6cb96.tar.bz2 | |
WidgetDelegate is now always created. Specified through InitParams, if NULL Widget will make a default one.
BUG=72040
TEST=none
Review URL: http://codereview.chromium.org/7080068
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87609 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/window')
| -rw-r--r-- | views/window/window.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/views/window/window.cc b/views/window/window.cc index b48b196..bae284e 100644 --- a/views/window/window.cc +++ b/views/window/window.cc @@ -81,11 +81,9 @@ gfx::Size Window::GetLocalizedContentsSize(int col_resource_id, void Window::InitWindow(const InitParams& params) { window_delegate_ = params.window_delegate; - AsWidget()->set_widget_delegate(window_delegate_); DCHECK(window_delegate_); DCHECK(!window_delegate_->window_); window_delegate_->window_ = this; - set_widget_delegate(window_delegate_); native_window_ = params.native_window ? params.native_window : NativeWindow::CreateNativeWindow(this); @@ -93,6 +91,7 @@ void Window::InitWindow(const InitParams& params) { if (!non_client_view()->frame_view()) non_client_view()->SetFrameView(CreateFrameViewForWindow()); InitParams modified_params = params; + modified_params.widget_init_params.delegate = params.window_delegate; modified_params.widget_init_params.native_widget = native_window_->AsNativeWidget(); Init(modified_params.widget_init_params); |