Fixes crash in RemoteWindowTreeHostWin::HandleActivateDesktop

chrome/browser/lifetime/application_lifetime_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/lifetime/application_lifetime.h"
 
 #include "base/bind.h"
 #include "base/prefs/pref_service.h"
 #include "base/win/metro.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/first_run/upgrade_util.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/common/pref_names.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(USE_AURA)
 #include "base/environment.h"
 #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 {
 
 #if !defined(USE_AURA)
 void HandleAppExitingForPlatform() {
   views::Widget::CloseAllSecondaryWidgets();
 }
 #endif
 
@@ skipping 44 matching lines @@
   // build tree however (where CHROME_VERSION is not set in the environment)
   // look for it in Chrome's directory.
   if (!version_str.empty())
     path = path.AppendASCII(version_str);
 
   path = path.Append(installer::kDelegateExecuteExe);
 
   // 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
 
 void AttemptRestartToDesktopMode() {
   PrefService* prefs = g_browser_process->local_state();
   prefs->SetString(prefs::kRelaunchMode,
                    upgrade_util::kRelaunchModeDesktop);
 
   AttemptRestart();
 }
 
 void AttemptRestartToMetroMode() {
   PrefService* prefs = g_browser_process->local_state();
   prefs->SetString(prefs::kRelaunchMode,
                    upgrade_util::kRelaunchModeMetro);
   AttemptRestart();
 }
 
 }  // namespace chrome