mash: Move directly linked NewWindowDelegate to mojom::NewWindowClient.

chrome/browser/ui/browser_commands.cc

 // Copyright 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/ui/browser_commands.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
@@ skipping 97 matching lines @@
 #endif  // defined(ENABLE_PRINTING)
 
 #if defined(ENABLE_RLZ)
 #include "components/rlz/rlz_tracker.h"  // nogncheck
 #endif
 
 #if defined(ENABLE_MEDIA_ROUTER)
 #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";
 }
 
 using base::UserMetricsAction;
 using bookmarks::BookmarkModel;
 using content::NavigationController;
 using content::NavigationEntry;
 using content::OpenURLParams;
 using content::Referrer;
@@ skipping 925 matching lines @@
 #if defined(ENABLE_TASK_MANAGER)
   return true;
 #else
   return false;
 #endif
 }
 
 void OpenTaskManager(Browser* browser) {
 #if defined(ENABLE_TASK_MANAGER)
   content::RecordAction(UserMetricsAction("TaskManager"));
-  chrome::ShowTaskManager(browser);
+
+#if defined(USE_ASH)
+  if (chrome::IsRunningInMash()) {
+    service_manager::Connector* connector =

[James Cook, 2016/10/21 22:22:31]

nit: Maybe comment pointing out that under mash the task viewer is a separate
application? And maybe why that's a good idea?

[Elliot Glaysher, 2016/10/21 22:45:56]

Done.

+        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
 }
 
 void OpenFeedbackDialog(Browser* browser) {
   content::RecordAction(UserMetricsAction("Feedback"));
   chrome::ShowFeedbackPage(browser, std::string(), std::string());
 }
 
@@ skipping 223 matching lines @@
       app_name, true /* trusted_source */, gfx::Rect(), browser->profile()));
   app_browser->tab_strip_model()->AppendWebContents(contents, true);
 
   contents->GetMutableRendererPrefs()->can_accept_load_drops = false;
   contents->GetRenderViewHost()->SyncRendererPrefs();
   app_browser->window()->Show();
 }
 #endif  // defined(ENABLE_EXTENSIONS)
 
 }  // namespace chrome