diff options
| author | zturner@chromium.org <zturner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-13 20:21:24 +0000 |
|---|---|---|
| committer | zturner@chromium.org <zturner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-13 20:21:24 +0000 |
| commit | 8393c30362716313ccc200e7c11c761eb0a42982 (patch) | |
| tree | 27c8bb5fc0766ab8633d34d20b319ed0d32451f5 /win8/metro_driver | |
| parent | 4ad3b4428e3fbcff048cc514f761a51dd2652e86 (diff) | |
| download | chromium_src-8393c30362716313ccc200e7c11c761eb0a42982.zip chromium_src-8393c30362716313ccc200e7c11c761eb0a42982.tar.gz chromium_src-8393c30362716313ccc200e7c11c761eb0a42982.tar.bz2 | |
Show the download cancellation confirmation on relaunch to desktop.
The issue is that previously, in response to the menu click
handler, we were attempting to show the Confirmation dialog
(which is asynchronous), and then sending a message to the
metro viewer to activate the desktop. This notification
would terminate the metro viewer process, so the dialog
would never be displayed.
The fix is to only send the message to the metro viewer
after we determine that it's safe to close (either because
the user clicked yes on the cancel dialog, or because there
were no pending downloads to begin with).
It was necessary for me to remove a DCHECK from the
StartPageService::ProfileDestroyObserver. The service's
profile member was non NULL and the the one being passed in
as the notification details was null. I suspect I will need
to fix this, but I spent a while looking over the code and
it was not obvious to me how this shutdown flow works, or
even if this was a valid DCHECK(), so I would like to get
some input from apps people on this point.
BUG=315924
R=ananta@chromium.org, jschuh@chromium.org, sky@chromium.org, tapted@chromium.org
Review URL: https://codereview.chromium.org/108773002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240730 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'win8/metro_driver')
| -rw-r--r-- | win8/metro_driver/chrome_app_view_ash.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/win8/metro_driver/chrome_app_view_ash.cc b/win8/metro_driver/chrome_app_view_ash.cc index f4d980a..8b64251 100644 --- a/win8/metro_driver/chrome_app_view_ash.cc +++ b/win8/metro_driver/chrome_app_view_ash.cc @@ -718,7 +718,6 @@ void ChromeAppViewAsh::OnActivateDesktop(const base::FilePath& file_path, ::TerminateProcess(sei.hProcess, 0); ::CloseHandle(sei.hProcess); } - ui_channel_->Send(new MetroViewerHostMsg_ActivateDesktopDone()); } void ChromeAppViewAsh::OnOpenURLOnDesktop(const base::FilePath& shortcut, |