Remove LauncherItemController::type; use ShelfItems::type.

chrome/browser/ui/ash/launcher/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_LAUNCHER_ITEM_CONTROLLER_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_ITEM_CONTROLLER_H_
 
 #include <string>
 
 #include "ash/common/shelf/shelf_item_delegate.h"
 #include "ash/common/shelf/shelf_item_types.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_types.h"
 #include "ui/events/event.h"
 
 class ChromeLauncherController;
 class ChromeLauncherAppMenuItem;
 
 typedef ScopedVector<ChromeLauncherAppMenuItem> ChromeLauncherAppMenuItems;
 
 // LauncherItemController is used by ChromeLauncherController to track one
 // or more windows associated with a shelf item.
 class LauncherItemController : public ash::ShelfItemDelegate {
  public:
-  enum Type {
-    TYPE_APP,
-    TYPE_APP_PANEL,
-    TYPE_SHORTCUT,
-  };
-
-  LauncherItemController(Type type,
-                         const std::string& app_id,
+  LauncherItemController(const std::string& app_id,
                          const std::string& launch_id,
                          ChromeLauncherController* launcher_controller);
   ~LauncherItemController() override;
 
-  Type type() const { return type_; }
   ash::ShelfID shelf_id() const { return shelf_id_; }
   void set_shelf_id(ash::ShelfID id) { shelf_id_ = id; }
   const std::string& app_id() const { return app_id_; }
   const std::string& launch_id() const { return launch_id_; }
   ChromeLauncherController* launcher_controller() const {
     return launcher_controller_;
   }
 
   // Lock this item to the launcher without being pinned (windowed v1 apps).
   void lock() { locked_++; }
@@ skipping 15 matching lines @@
   virtual void Launch(ash::LaunchSource source, int event_flags) = 0;
 
   // Shows and activates the most-recently-active window associated with the
   // item, or launches the item if it is not currently open.
   // Returns the action performed by activating the item.
   virtual PerformedAction Activate(ash::LaunchSource source) = 0;
 
   // Called to retrieve the list of running applications.
   virtual ChromeLauncherAppMenuItems GetApplicationList(int event_flags) = 0;
 
-  // Helper function to get the ash::ShelfItemType for the item type.
-  ash::ShelfItemType GetShelfItemType() const;
-
  private:
-  const Type type_;
-
   // The application id; empty if there is no app associated with the item.
   const std::string app_id_;
 
   // An id that can be passed to an app when launched in order to support
   // multiple shelf items per app. This id is used together with the app_id to
   // uniquely identify each shelf item that has the same app_id.
   const std::string launch_id_;
 
   // A unique id assigned by the shelf model for the shelf item.
   ash::ShelfID shelf_id_;
 
   ChromeLauncherController* launcher_controller_;
 
   // The lock counter which tells the launcher if the item can be removed from
   // the launcher (0) or not (>0). It is being used for windowed V1
   // applications.
   int locked_;
 
   // Set to true if the launcher item image has been set by the controller.
   bool image_set_by_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(LauncherItemController);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_ITEM_CONTROLLER_H_