mash: Port ash_sysui app list presenter to mojo:ash.

ash/mus/app_list_presenter_mus.cc

Index: ash/mus/app_list_presenter_mus.cc
diff --git a/ash/sysui/app_list_presenter_mus.cc b/ash/mus/app_list_presenter_mus.cc
similarity index 73%
rename from ash/sysui/app_list_presenter_mus.cc
rename to ash/mus/app_list_presenter_mus.cc
index fb86591de19a5e2d7e49285de6360d84375009e3..c6c518004bfba0bd12835aab495d53d293227740 100644
--- a/ash/sysui/app_list_presenter_mus.cc
+++ b/ash/mus/app_list_presenter_mus.cc
@@ -2,19 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/sysui/app_list_presenter_mus.h"
+#include "ash/mus/app_list_presenter_mus.h"
 
 #include "services/shell/public/cpp/connector.h"
 
 namespace ash {
-namespace {
 
-// TODO(mfomitchev): Remove when http://crbug.com/607300 is fixed.

[mfomitchev, 2016/09/12 22:39:20]

Have you confirmed the issue fixed now? (I haven't been following Rob's and
Kyle's work closely enough to tell without testing myself).

[msw, 2016/09/12 22:52:09]

Indeed, it's fixed for this use case. Mus and Mash use the same ids. 

-// This method should not exist. Sys_ui has different display ids because it
-// uses ScreenAsh instead of ScreenMus.
-int64_t GetMusDisplayId(int64_t sysui_display_id) {
-  return 1;
-}
+namespace {
 
 bool HasConnection(app_list::mojom::AppListPresenterPtr* interface_ptr) {
   return interface_ptr->is_bound() && !interface_ptr->encountered_error();
@@ -23,14 +17,12 @@ bool HasConnection(app_list::mojom::AppListPresenterPtr* interface_ptr) {
 }  // namespace
 
 AppListPresenterMus::AppListPresenterMus(::shell::Connector* connector)
-    : connector_(connector) {
-  ConnectIfNeeded();
-}
+    : connector_(connector) {}
 
 AppListPresenterMus::~AppListPresenterMus() {}
 
 void AppListPresenterMus::Show(int64_t display_id) {
-  display_id = GetMusDisplayId(display_id);
+  ConnectIfNeeded();
   presenter_->Show(display_id);
 }
 
@@ -40,7 +32,6 @@ void AppListPresenterMus::Dismiss() {
 }
 
 void AppListPresenterMus::ToggleAppList(int64_t display_id) {
-  display_id = GetMusDisplayId(display_id);
   ConnectIfNeeded();
   presenter_->ToggleAppList(display_id);
 }
@@ -57,13 +48,12 @@ bool AppListPresenterMus::GetTargetVisibility() const {
   return false;
 }
 
-bool AppListPresenterMus::ConnectIfNeeded() {
-  if (HasConnection(&presenter_))
-    return true;
+void AppListPresenterMus::ConnectIfNeeded() {
+  if (!connector_ || HasConnection(&presenter_))
+    return;
   connector_->ConnectToInterface("exe:chrome", &presenter_);
   CHECK(HasConnection(&presenter_))
       << "Could not connect to app_list::mojom::AppListPresenter.";
-  return true;
 }
 
 }  // namespace ash