Merge ShelfItemDelegate::ItemSelected & LauncherItemDelegate::Activate.

chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SHORTCUT_LAUNCHER_ITEM_CONTROLLER_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SHORTCUT_LAUNCHER_ITEM_CONTROLLER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 23 matching lines @@
   ~AppShortcutLauncherItemController() override;
 
   static AppShortcutLauncherItemController* Create(
       const std::string& app_id,
       const std::string& launch_id,
       ChromeLauncherController* controller);
 
   std::vector<content::WebContents*> GetRunningApplications();
 
   // LauncherItemController overrides:
-  ash::ShelfItemDelegate::PerformedAction Activate(
-      ash::LaunchSource source) override;
-  ash::ShelfItemDelegate::PerformedAction ItemSelected(
-      const ui::Event& event) override;
+  ash::ShelfAction ItemSelected(ui::EventType event_type,
+                                int event_flags,
+                                int64_t display_id,
+                                ash::ShelfLaunchSource source) override;
   ash::ShelfAppMenuItemList GetAppMenuItems(int event_flags) override;
   void Close() override;
 
   // Get the refocus url pattern, which can be used to identify this application
   // from a URL link.
   const GURL& refocus_url() const { return refocus_url_; }
   // Set the refocus url pattern. Used by unit tests.
   void set_refocus_url(const GURL& refocus_url) { refocus_url_ = refocus_url; }
 
   ChromeLauncherController* controller() { return chrome_launcher_controller_; }
@@ skipping 12 matching lines @@
   // |refocus_pattern| get passed. If |is_app| is true, the application gets
   // first checked against its original URL since a windowed app might have
   // navigated away from its app domain.
   bool WebContentMatchesApp(const extensions::Extension* extension,
                             const URLPattern& refocus_pattern,
                             content::WebContents* web_contents,
                             Browser* browser);
 
   // Activate the browser with the given |content| and show the associated tab.
   // Returns the action performed by activating the content.
-  ash::ShelfItemDelegate::PerformedAction ActivateContent(
-      content::WebContents* content);
+  ash::ShelfAction ActivateContent(content::WebContents* content);
 
   // Advance to the next item if an owned item is already active. The function
   // will return true if it has successfully advanced.
   bool AdvanceToNextApp();
 
   // Returns true if the application is a V2 app.
   bool IsV2App();
 
   // Returns true if it is allowed to try starting a V2 app again.
   bool AllowNextLaunchAttempt();
 
   GURL refocus_url_;
 
   // Since V2 applications can be undetectable after launching, this timer is
   // keeping track of the last launch attempt.
   base::Time last_launch_attempt_;
 
   ChromeLauncherController* chrome_launcher_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(AppShortcutLauncherItemController);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SHORTCUT_LAUNCHER_ITEM_CONTROLLER_H_