Merge ShelfItemDelegate::ItemSelected & LauncherItemDelegate::Activate.

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

 // Copyright 2013 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_CHROME_LAUNCHER_CONTROLLER_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "ash/common/shelf/shelf_item_delegate.h"
 #include "ash/common/shelf/shelf_item_types.h"
 #include "ash/public/cpp/shelf_application_menu_item.h"
 #include "ash/public/interfaces/shelf.mojom.h"
 #include "chrome/browser/ui/app_icon_loader.h"
 #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"
 
 class AccountId;
 class ArcAppDeferredLauncherController;
 class BrowserShortcutLauncherItemController;
 class GURL;
 class LauncherControllerHelper;
 class LauncherItemController;
 
@@ skipping 100 matching lines @@
 
   // Returns true if the specified item is open.
   virtual bool IsOpen(ash::ShelfID id) = 0;
 
   // Returns true if the specified item is for a platform app.
   virtual bool IsPlatformApp(ash::ShelfID id) = 0;
 
   // 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).
   virtual void SetLauncherItemImage(ash::ShelfID shelf_id,
                                     const gfx::ImageSkia& image) = 0;
 
   // Notify the controller that the state of an non platform app's tabs
   // have changed,
   virtual void UpdateAppState(content::WebContents* contents,
                               AppState app_state) = 0;
 
   // Returns ShelfID for |contents|. If |contents| is not an app or is not
   // pinned, returns the id of browser shrotcut.
   virtual ash::ShelfID GetShelfIDForWebContents(
       content::WebContents* contents) = 0;
 
   // Limits application refocusing to urls that match |url| for |id|.
   virtual void SetRefocusURLPatternForTest(ash::ShelfID id,
                                            const GURL& url) = 0;
 
   // 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;
 
   // Called when a user got added to the session.
   virtual void AdditionalUserAddedToSession(Profile* profile) = 0;
 
   // Get the list of all running incarnations of this item.
   // |event_flags| specifies the flags which were set by the event which
   // triggered this menu generation. It can be used to generate different lists.
@@ skipping 123 matching lines @@
   // An observer that manages the shelf title and icon for settings windows.
   SettingsWindowObserver settings_window_observer_;
 
   // Used to load the images for app items.
   std::vector<std::unique_ptr<AppIconLoader>> app_icon_loaders_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeLauncherController);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_