diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-03 01:07:15 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-03 01:07:15 +0000 |
| commit | ef589afc44a9ce7ccedb1948eace1f2fbfe7ec49 (patch) | |
| tree | cfcff5b66e29903686b29c2d41e48ca2d0c560fd /ui/views | |
| parent | ede5e61adaed9fb0c553161a075e4ee327cd4cae (diff) | |
| download | chromium_src-ef589afc44a9ce7ccedb1948eace1f2fbfe7ec49.zip chromium_src-ef589afc44a9ce7ccedb1948eace1f2fbfe7ec49.tar.gz chromium_src-ef589afc44a9ce7ccedb1948eace1f2fbfe7ec49.tar.bz2 | |
Delete desktop/shell instance correctly upon shutdown.
* Moved parts->PostMainMessageLoopRun call from PostDestroyThreads to the right place (PostMainMessageLoopRun() method)
* Renamed Shell::DeleteInstanceForTesting to DeleteInstance as this is no longer for testing.
BUG=106070
TEST=browser_tests on aura will not crash as described in the bug
Review URL: http://codereview.chromium.org/8774029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112836 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views')
| -rw-r--r-- | ui/views/widget/native_widget_aura.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc index 8308a45..26d3392 100644 --- a/ui/views/widget/native_widget_aura.cc +++ b/ui/views/widget/native_widget_aura.cc @@ -372,10 +372,10 @@ void NativeWidgetAura::Close() { // and ownership is WIDGET_OWNS_NATIVE_WIDGET. DCHECK(window_ || ownership_ == Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET); - if (window_) + if (window_) { Hide(); - - window_->SetIntProperty(aura::kModalKey, 0); + window_->SetIntProperty(aura::kModalKey, 0); + } if (!close_widget_factory_.HasWeakPtrs()) { MessageLoop::current()->PostTask( |