 Chromium Code Reviews
 Chromium Code Reviews Issue 2434463004:
  mash: Move directly linked NewWindowDelegate to mojom::NewWindowClient.  (Closed)
    
  
    Issue 2434463004:
  mash: Move directly linked NewWindowDelegate to mojom::NewWindowClient.  (Closed) 
  | Index: chrome/browser/ui/browser_commands.cc | 
| diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc | 
| index 4b328bcd344b0519969b1833423c8ac61d192a61..2011d11d30e98d0af7f93c21f7157e22e8d7bb05 100644 | 
| --- a/chrome/browser/ui/browser_commands.cc | 
| +++ b/chrome/browser/ui/browser_commands.cc | 
| @@ -115,6 +115,13 @@ | 
| #include "chrome/browser/media/router/media_router_dialog_controller.h" // nogncheck | 
| #endif | 
| +#if defined(USE_ASH) | 
| +#include "chrome/browser/ui/ash/ash_util.h" | 
| +#include "content/public/common/service_manager_connection.h" | 
| +#include "mash/public/interfaces/launchable.mojom.h" | 
| +#include "services/service_manager/public/cpp/connector.h" | 
| +#endif | 
| + | 
| namespace { | 
| const char kOsOverrideForTabletSite[] = "Linux; Android 4.0.3"; | 
| } | 
| @@ -1060,7 +1067,23 @@ bool CanOpenTaskManager() { | 
| void OpenTaskManager(Browser* browser) { | 
| #if defined(ENABLE_TASK_MANAGER) | 
| content::RecordAction(UserMetricsAction("TaskManager")); | 
| - chrome::ShowTaskManager(browser); | 
| + | 
| +#if defined(USE_ASH) | 
| + if (chrome::IsRunningInMash()) { | 
| 
sky
2016/10/21 23:26:00
The mash task viewer doesn't convey everything the
 
Elliot Glaysher
2016/10/25 23:30:50
Moved back to chrome's task viewer for now.
 | 
| + // In mash, the task viewer is a separate application because there are | 
| + // more applications than chrome. | 
| + service_manager::Connector* connector = | 
| + content::ServiceManagerConnection::GetForProcess()->GetConnector(); | 
| + mash::mojom::LaunchablePtr launchable; | 
| + connector->ConnectToInterface("service:task_viewer", &launchable); | 
| + launchable->Launch(mash::mojom::kWindow, | 
| + mash::mojom::LaunchMode::DEFAULT); | 
| + } | 
| + else | 
| +#endif | 
| + { | 
| + chrome::ShowTaskManager(browser); | 
| + } | 
| #else | 
| NOTREACHED(); | 
| #endif |