Combine shelf platform and windowed app types.

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"
@@ skipping 19 matching lines @@
 }
 
 // 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,
-    TYPE_WINDOWED_APP
   };
 
   LauncherItemController(Type type,
                          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_; }
@@ skipping 55 matching lines @@
   // 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_