summaryrefslogtreecommitdiffstats
path: root/win8
diff options
context:
space:
mode:
authorscottmg <scottmg@chromium.org>2014-09-22 09:51:00 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-22 16:51:16 +0000
commit3c19343e8829c302e8ff9421deea89b50dfb0d27 (patch)
tree290ce0685109794f105b1747903ad0aa6ccd1dda /win8
parent1829b969ab012dda7bb061f1be8b50358ee81fba (diff)
downloadchromium_src-3c19343e8829c302e8ff9421deea89b50dfb0d27.zip
chromium_src-3c19343e8829c302e8ff9421deea89b50dfb0d27.tar.gz
chromium_src-3c19343e8829c302e8ff9421deea89b50dfb0d27.tar.bz2
Only do aggressive metro viewer termination in tests
The previous patch https://codereview.chromium.org/584513004 ran on all metro viewer shutdowns, which would lead to Alt-F4 not being processed which means that the proper metro process shutdown wouldn't happen, potentially leaving the "ghost" icon. Instead, only do the aggressive termination from the process_host side and only when running test binaries (where we're concerned about having the viewer be able to run again immediately.) R=ananta@chromium.org BUG=411147,416356 Review URL: https://codereview.chromium.org/584213002 Cr-Commit-Position: refs/heads/master@{#295995}
Diffstat (limited to 'win8')
-rw-r--r--win8/metro_driver/chrome_app_view_ash.cc3
1 files changed, 0 insertions, 3 deletions
diff --git a/win8/metro_driver/chrome_app_view_ash.cc b/win8/metro_driver/chrome_app_view_ash.cc
index 991857d..db2d9f3 100644
--- a/win8/metro_driver/chrome_app_view_ash.cc
+++ b/win8/metro_driver/chrome_app_view_ash.cc
@@ -970,9 +970,6 @@ void ChromeAppViewAsh::OnMetroExit(MetroTerminateMethod method) {
globals.app_exit->Exit();
}
-
- // Try really hard, see http://crbug.com/411147 for details.
- ::TerminateProcess(::GetCurrentProcess(), 0);
}
void ChromeAppViewAsh::OnInputSourceChanged() {