diff options
| author | shrikant@chromium.org <shrikant@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-12 21:48:02 +0000 |
|---|---|---|
| committer | shrikant@chromium.org <shrikant@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-12 21:48:02 +0000 |
| commit | 930bed499165645123aaf1440821564ccc525580 (patch) | |
| tree | bf433b1772f6727b8998a74df61480e7bf8cff66 /win8 | |
| parent | 264c3cd36682bac1f380f8689eb301cf7ef37305 (diff) | |
| download | chromium_src-930bed499165645123aaf1440821564ccc525580.zip chromium_src-930bed499165645123aaf1440821564ccc525580.tar.gz chromium_src-930bed499165645123aaf1440821564ccc525580.tar.bz2 | |
Reverted metro exit sequence back to original one.
Change was introduced in https://codereview.chromium.org/235933004/
BUG=366175
R=ananta,cpu
Review URL: https://codereview.chromium.org/274793002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269884 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'win8')
| -rw-r--r-- | win8/metro_driver/chrome_app_view_ash.cc | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/win8/metro_driver/chrome_app_view_ash.cc b/win8/metro_driver/chrome_app_view_ash.cc index a82ab1f..981a21c 100644 --- a/win8/metro_driver/chrome_app_view_ash.cc +++ b/win8/metro_driver/chrome_app_view_ash.cc @@ -925,12 +925,17 @@ void ChromeAppViewAsh::OnMetroExit(MetroTerminateMethod method) { core_window == ::GetForegroundWindow()) { DVLOG(1) << "We are in the foreground. Exiting via Alt F4"; SendKeySequence(VK_F4, ALT); + if (ui_channel_) + ui_channel_->Close(); + } else { + globals.app_exit->Exit(); } - } - if (ui_channel_) - ui_channel_->Close(); + } else { + if (ui_channel_) + ui_channel_->Close(); - globals.app_exit->Exit(); + globals.app_exit->Exit(); + } } void ChromeAppViewAsh::OnInputSourceChanged() { |