Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(506)

Unified Diff: ui/aura/remote_root_window_host_win.cc

Issue 130223002: Have browser process shutdown metro viewer on Metro -> Metro restart. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use scoped_ptr.get() instead of relying on conversion. Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/aura/remote_root_window_host_win.h ('k') | ui/metro_viewer/metro_viewer_messages.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/remote_root_window_host_win.cc
diff --git a/ui/aura/remote_root_window_host_win.cc b/ui/aura/remote_root_window_host_win.cc
index 5628e134aefa7a531cd36646ffdaa2941c2a1a7c..146133829ee61b1ddc9a9a7454f4246bca7baf4b 100644
--- a/ui/aura/remote_root_window_host_win.cc
+++ b/ui/aura/remote_root_window_host_win.cc
@@ -142,6 +142,11 @@ void HandleActivateDesktop(const base::FilePath& shortcut,
ash_exit);
}
+void HandleMetroExit() {
+ DCHECK(aura::RemoteWindowTreeHostWin::Instance());
+ aura::RemoteWindowTreeHostWin::Instance()->HandleMetroExit();
+}
+
RemoteWindowTreeHostWin* g_instance = NULL;
RemoteWindowTreeHostWin* RemoteWindowTreeHostWin::Instance() {
@@ -249,6 +254,12 @@ void RemoteWindowTreeHostWin::HandleActivateDesktop(
host_->Send(new MetroViewerHostMsg_ActivateDesktop(shortcut, ash_exit));
}
+void RemoteWindowTreeHostWin::HandleMetroExit() {
+ if (!host_)
+ return;
+ host_->Send(new MetroViewerHostMsg_MetroExit());
+}
+
void RemoteWindowTreeHostWin::HandleOpenFile(
const base::string16& title,
const base::FilePath& default_path,
« no previous file with comments | « ui/aura/remote_root_window_host_win.h ('k') | ui/metro_viewer/metro_viewer_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698