summaryrefslogtreecommitdiffstats
path: root/ui/metro_viewer
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-05 21:44:34 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-05 21:44:34 +0000
commitb9503276adc3f736b9a2c07116297fbfaf9a96fb (patch)
tree36b218b0532590cf1d54f1c9b51984e1e0cd2db3 /ui/metro_viewer
parent3fae4c589cc60e1b43a618d6e4bfdd078da507d1 (diff)
downloadchromium_src-b9503276adc3f736b9a2c07116297fbfaf9a96fb.zip
chromium_src-b9503276adc3f736b9a2c07116297fbfaf9a96fb.tar.gz
chromium_src-b9503276adc3f736b9a2c07116297fbfaf9a96fb.tar.bz2
Ensure that the Chrome downloads folder option in Chrome ASH on Windows switches to desktop mode while opening the
downloads folder. The current behavior is that the downloads folder is opened on the desktop while the user continues to stay in ASH mode leading to confusion. To fix this we reuse the ActivateDesktopHelper function in application_lifetime_win.cc. This function takes a boolean parameter now which indicates if we should be exiting ash after activating the desktop. This flag is true when we launch desktop chrome from ASH and is false when invoked to open the downloads folder via the functions in platform_util_win.cc. The MetroViewerHostMsg_ActivateDesktop IPC now has a flag which indicates if we should exit ash after activating desktop. If this flag is false we terminate the delegate_execute process which was launched to switch to desktop. Fixes bug https://code.google.com/p/chromium/issues/detail?id=324252 BUG=324252 R=cpu@chromium.org, jschuh@chromium.org, sky@chromium.org, cpu Review URL: https://codereview.chromium.org/102603006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239041 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/metro_viewer')
-rw-r--r--ui/metro_viewer/metro_viewer_messages.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/ui/metro_viewer/metro_viewer_messages.h b/ui/metro_viewer/metro_viewer_messages.h
index 3cddb2e..d562461 100644
--- a/ui/metro_viewer/metro_viewer_messages.h
+++ b/ui/metro_viewer/metro_viewer_messages.h
@@ -97,8 +97,9 @@ IPC_MESSAGE_CONTROL0(MetroViewerHostMsg_ActivateDesktopDone)
// Messages sent from the browser to the viewer:
// Requests the viewer to activate desktop mode.
-IPC_MESSAGE_CONTROL1(MetroViewerHostMsg_ActivateDesktop,
- base::FilePath /* shortcut */);
+IPC_MESSAGE_CONTROL2(MetroViewerHostMsg_ActivateDesktop,
+ base::FilePath /* shortcut */,
+ bool /* ash exit */);
// Requests the viewer to open a URL in desktop mode.
IPC_MESSAGE_CONTROL2(MetroViewerHostMsg_OpenURLOnDesktop,