Merge ShelfItemDelegate::ItemSelected & LauncherItemDelegate::Activate.

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

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
index 94c31e4e1ab62a4ae3b7406cc1edc438705c181b..e8622d7fd1bf016e29e46f131a09f67cfba1a6d2 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
@@ -17,7 +17,6 @@
 #include "chrome/browser/ui/app_icon_loader_delegate.h"
 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
 #include "chrome/browser/ui/ash/app_launcher_id.h"
-#include "chrome/browser/ui/ash/launcher/chrome_launcher_types.h"
 #include "chrome/browser/ui/ash/launcher/settings_window_observer.h"
 #include "mojo/public/cpp/bindings/associated_binding.h"
 
@@ -138,14 +137,14 @@ class ChromeLauncherController : public ash::mojom::ShelfObserver,
   // Opens a new instance of the application identified by the AppLauncherId.
   // Used by the app-list, and by pinned-app shelf items.
   void LaunchApp(ash::AppLauncherId id,
-                 ash::LaunchSource source,
+                 ash::ShelfLaunchSource source,
                  int event_flags);
 
   // If |app_id| is running, reactivates the app's most recently active window,
   // otherwise launches and activates the app.
   // Used by the app-list, and by pinned-app shelf items.
   virtual void ActivateApp(const std::string& app_id,
-                           ash::LaunchSource source,
+                           ash::ShelfLaunchSource source,
                            int event_flags) = 0;
 
   // Set the image for a specific shelf item (e.g. when set by the app).
@@ -168,11 +167,11 @@ class ChromeLauncherController : public ash::mojom::ShelfObserver,
 
   // Activates a |window|. If |allow_minimize| is true and the system allows
   // it, the the window will get minimized instead.
-  // Returns the action performed. Should be one of kNoAction,
-  // kExistingWindowActivated, or kExistingWindowMinimized.
-  virtual ash::ShelfItemDelegate::PerformedAction
-  ActivateWindowOrMinimizeIfActive(ui::BaseWindow* window,
-                                   bool allow_minimize) = 0;
+  // Returns the action performed. Should be one of SHELF_ACTION_NONE,
+  // SHELF_ACTION_WINDOW_ACTIVATED, or SHELF_ACTION_WINDOW_MINIMIZED.
+  virtual ash::ShelfAction ActivateWindowOrMinimizeIfActive(
+      ui::BaseWindow* window,
+      bool allow_minimize) = 0;
 
   // Called when the active user has changed.
   virtual void ActiveUserChanged(const std::string& user_email) = 0;