summaryrefslogtreecommitdiffstats
path: root/chrome/browser/lifetime
diff options
context:
space:
mode:
authorananta <ananta@chromium.org>2014-08-28 14:37:55 -0700
committerCommit bot <commit-bot@chromium.org>2014-08-28 21:38:57 +0000
commit196db19755cd25d7da5371442c2394e1510051ad (patch)
treeb1da263f36a2ca5bed8ee9cb9436d74aa195032a /chrome/browser/lifetime
parent421cc21a251e4828fe3065884a9fdf1a47b49d07 (diff)
downloadchromium_src-196db19755cd25d7da5371442c2394e1510051ad.zip
chromium_src-196db19755cd25d7da5371442c2394e1510051ad.tar.gz
chromium_src-196db19755cd25d7da5371442c2394e1510051ad.tar.bz2
Add relaunch into ASH and desktop support for Chrome on Windows 7.
This is on similar lines as Windows 8. The difference being launching into ASH on Windows 8 launches ASH into Windows 8 metro environment. Reused the existing tunneling we have via delegate_execute to ensure that the calling process is terminated before launching the browser into the other environment. Removed the erstshile Open Ash Desktop and Close Ash Desktop menu options as they are no longer needed and they don't work correctly anyways. BUG=356475 Review URL: https://codereview.chromium.org/498573003 Cr-Commit-Position: refs/heads/master@{#292464}
Diffstat (limited to 'chrome/browser/lifetime')
-rw-r--r--chrome/browser/lifetime/application_lifetime.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/lifetime/application_lifetime.h b/chrome/browser/lifetime/application_lifetime.h
index 0a5db429..bc28f52 100644
--- a/chrome/browser/lifetime/application_lifetime.h
+++ b/chrome/browser/lifetime/application_lifetime.h
@@ -41,11 +41,13 @@ enum AshExecutionStatus {
// activating desktop.
void ActivateDesktopHelper(AshExecutionStatus ash_execution_status);
-// Windows 8 specific: Like AttemptRestart but if chrome is running
+// Windows 7/8 specific: Like AttemptRestart but if chrome is running
// in desktop mode it starts in metro mode and vice-versa. The switching like
// the restarting is controlled by a preference.
void AttemptRestartWithModeSwitch();
void AttemptRestartToDesktopMode();
+// Launches Chrome into Windows 8 metro mode on Windows 8. On Windows 7 it
+// launches Chrome into Windows ASH.
void AttemptRestartToMetroMode();
#endif