diff options
| author | zturner@chromium.org <zturner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-11 03:11:37 +0000 |
|---|---|---|
| committer | zturner@chromium.org <zturner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-11 03:11:37 +0000 |
| commit | 0f48fcb931e4709f0f1a9f9f3cf6970041065bf9 (patch) | |
| tree | a117d269fddf3c6ba13080cfd0d80bb0940a7832 /win8 | |
| parent | f8197029e47adb3512609ec18f5aa7f3059befd3 (diff) | |
| download | chromium_src-0f48fcb931e4709f0f1a9f9f3cf6970041065bf9.zip chromium_src-0f48fcb931e4709f0f1a9f9f3cf6970041065bf9.tar.gz chromium_src-0f48fcb931e4709f0f1a9f9f3cf6970041065bf9.tar.bz2 | |
Have browser process shutdown metro viewer on Metro -> Metro restart.
Metro -> Metro restarts can happen as a result of changing about:flags, or a chrome update. In order for the metro viewer to exit, it is necessary for the browser to notify the metro viewer that it needs to close itself. This was happening for Metro -> Desktop restarts, but not for Metro -> Metro restarts.
BUG=332063
Review URL: https://codereview.chromium.org/130223002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244330 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'win8')
| -rw-r--r-- | win8/metro_driver/chrome_app_view_ash.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/win8/metro_driver/chrome_app_view_ash.cc b/win8/metro_driver/chrome_app_view_ash.cc index 79649ff..c978d8e 100644 --- a/win8/metro_driver/chrome_app_view_ash.cc +++ b/win8/metro_driver/chrome_app_view_ash.cc @@ -157,6 +157,7 @@ class ChromeChannelListener : public IPC::Listener { IPC_BEGIN_MESSAGE_MAP(ChromeChannelListener, message) IPC_MESSAGE_HANDLER(MetroViewerHostMsg_ActivateDesktop, OnActivateDesktop) + IPC_MESSAGE_HANDLER(MetroViewerHostMsg_MetroExit, OnMetroExit) IPC_MESSAGE_HANDLER(MetroViewerHostMsg_OpenURLOnDesktop, OnOpenURLOnDesktop) IPC_MESSAGE_HANDLER(MetroViewerHostMsg_SetCursor, OnSetCursor) @@ -194,6 +195,10 @@ class ChromeChannelListener : public IPC::Listener { shortcut, ash_exit)); } + void OnMetroExit() { + MetroExit(app_view_->core_window_hwnd()); + } + void OnOpenURLOnDesktop(const base::FilePath& shortcut, const base::string16& url) { ui_proxy_->PostTask(FROM_HERE, |