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

Unified Diff: chrome/browser/lifetime/application_lifetime_win.cc

Issue 297713002: Fixes crash in RemoteWindowTreeHostWin::HandleActivateDesktop (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: follow old pattern Created 6 years, 7 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 | « no previous file | chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/lifetime/application_lifetime_win.cc
diff --git a/chrome/browser/lifetime/application_lifetime_win.cc b/chrome/browser/lifetime/application_lifetime_win.cc
index a3ffd5be1af5a66d7e5b38c756dbd5bdb1a6ba6e..be012ed3baef3b434a0ba640f0386414b98b926d 100644
--- a/chrome/browser/lifetime/application_lifetime_win.cc
+++ b/chrome/browser/lifetime/application_lifetime_win.cc
@@ -19,11 +19,11 @@
#include "base/files/file_path.h"
#include "base/path_service.h"
#include "chrome/browser/metro_utils/metro_chrome_win.h"
+#include "chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.h"
#include "chrome/browser/shell_integration.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/installer/util/util_constants.h"
#include "content/public/browser/web_contents.h"
-#include "ui/aura/remote_window_tree_host_win.h"
#endif
namespace chrome {
@@ -88,7 +88,7 @@ void ActivateDesktopHelper(AshExecutionStatus ash_execution_status) {
// Actually launching the process needs to happen in the metro viewer,
// otherwise it won't automatically transition to desktop. So we have
// to send an IPC to the viewer to do the ShellExecute.
- aura::HandleActivateDesktop(path, ash_execution_status == ASH_TERMINATE);
+ HandleActivateDesktop(path, ash_execution_status == ASH_TERMINATE);
}
#endif
« no previous file with comments | « no previous file | chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698