diff options
| author | glotov@google.com <glotov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-01 16:34:25 +0000 |
|---|---|---|
| committer | glotov@google.com <glotov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-01 16:34:25 +0000 |
| commit | 9cb7dc09fc29fc71a5fc5177fe9c4204cd14e4b5 (patch) | |
| tree | 99b1ce45f3c84aa49b6f8938f397c35c2d676ff3 /views | |
| parent | 284d23abec629e3050ecf57f7a406e3d64555b3b (diff) | |
| download | chromium_src-9cb7dc09fc29fc71a5fc5177fe9c4204cd14e4b5.zip chromium_src-9cb7dc09fc29fc71a5fc5177fe9c4204cd14e4b5.tar.gz chromium_src-9cb7dc09fc29fc71a5fc5177fe9c4204cd14e4b5.tar.bz2 | |
Completely removed if (widget_) in ~NativeWidgetGtk()
BUG=chromium-os:15129
TEST=tests
Review URL: http://codereview.chromium.org/7105017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87486 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/widget/native_widget_gtk.cc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/views/widget/native_widget_gtk.cc b/views/widget/native_widget_gtk.cc index fc61e62..b49a31e 100644 --- a/views/widget/native_widget_gtk.cc +++ b/views/widget/native_widget_gtk.cc @@ -322,14 +322,7 @@ NativeWidgetGtk::NativeWidgetGtk(internal::NativeWidgetDelegate* delegate) } NativeWidgetGtk::~NativeWidgetGtk() { - if (widget_) { - ui::GObjectDestructorFILO::GetInstance()->Disconnect( - G_OBJECT(widget_), &OnDestroyedThunk, this); - if (ownership_ != Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET) - CloseNow(); - } - DCHECK(ownership_ == Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET || - widget_ == NULL); + DCHECK(widget_ == NULL); // We need to delete the input method before calling DestroyRootView(), // because it'll set focus_manager_ to NULL. input_method_.reset(); |