[Merge M58] arc: Fix regression in handling ARC shelf item.

chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller.cc

 // Copyright 2016 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/ash/launcher/arc_app_window_launcher_item_controller.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
@@ skipping 34 matching lines @@
   }
 
   if (task_ids_.empty()) {
     NOTREACHED();
     return ash::SHELF_ACTION_NONE;
   }
   arc::SetTaskActive(*task_ids_.begin());
   return ash::SHELF_ACTION_NEW_WINDOW_CREATED;
 }
 
+void ArcAppWindowLauncherItemController::ExecuteCommand(uint32_t command_id,
+                                                        int32_t event_flags) {
+  ActivateIndexedApp(command_id);
+}
+
 ash::ShelfAppMenuItemList ArcAppWindowLauncherItemController::GetAppMenuItems(
     int event_flags) {
   ash::ShelfAppMenuItemList items;
   base::string16 app_title = LauncherControllerHelper::GetAppTitle(
       launcher_controller()->profile(), app_id());
   for (auto it = windows().begin(); it != windows().end(); ++it) {
     // TODO(khmel): resolve correct icon here.
     size_t i = std::distance(windows().begin(), it);
     gfx::Image image;
     aura::Window* window = (*it)->GetNativeWindow();
     items.push_back(base::MakeUnique<ash::ShelfApplicationMenuItem>(
         base::checked_cast<uint32_t>(i),
         ((window && !window->GetTitle().empty()) ? window->GetTitle()
                                                  : app_title),
         &image));
   }
   return items;
 }