mash: Move shelf model and item classes to ash/common/shelf

ash/shelf/shelf_model.h

Index: ash/shelf/shelf_model.h
diff --git a/ash/shelf/shelf_model.h b/ash/shelf/shelf_model.h
deleted file mode 100644
index 1f29124dd158dab318ebe5d49a1040f91b3ed136..0000000000000000000000000000000000000000
--- a/ash/shelf/shelf_model.h
+++ /dev/null
@@ -1,101 +0,0 @@
-// 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 ASH_SHELF_SHELF_MODEL_H_
-#define ASH_SHELF_SHELF_MODEL_H_
-
-#include "ash/ash_export.h"
-#include "ash/shelf/shelf_item_types.h"
-#include "base/macros.h"
-#include "base/observer_list.h"
-
-namespace ash {
-
-class ShelfModelObserver;
-
-// Model used by ShelfView.
-class ASH_EXPORT ShelfModel {
- public:
-  enum Status {
-    STATUS_NORMAL,
-    // A status that indicates apps are syncing/loading.
-    STATUS_LOADING,
-  };
-
-  ShelfModel();
-  ~ShelfModel();
-
-  // Adds a new item to the model. Returns the resulting index.
-  int Add(const ShelfItem& item);
-
-  // Adds the item. |index| is the requested insertion index, which may be
-  // modified to meet type-based ordering. Returns the actual insertion index.
-  int AddAt(int index, const ShelfItem& item);
-
-  // Removes the item at |index|.
-  void RemoveItemAt(int index);
-
-  // Moves the item at |index| to |target_index|. |target_index| is in terms
-  // of the model *after* the item at |index| is removed.
-  void Move(int index, int target_index);
-
-  // Resets the item at the specified index. The item maintains its existing
-  // id and type.
-  void Set(int index, const ShelfItem& item);
-
-  // Returns the index of the item by id.
-  int ItemIndexByID(ShelfID id) const;
-
-  // Returns the |index| of the item matching |type| in |items_|.
-  // Returns -1 if the matching item is not found.
-  // Note: Requires a linear search.
-  int GetItemIndexForType(ShelfItemType type);
-
-  // Returns the index of the first running application or the index where the
-  // first running application would go if there are no running (non pinned)
-  // applications yet.
-  int FirstRunningAppIndex() const;
-
-  // Returns the index of the first panel or the index where the first panel
-  // would go if there are no panels.
-  int FirstPanelIndex() const;
-
-  // Returns the id assigned to the next item added.
-  ShelfID next_id() const { return next_id_; }
-
-  // Returns a reserved id which will not be used by the |ShelfModel|.
-  ShelfID reserve_external_id() { return next_id_++; }
-
-  // Returns an iterator into items() for the item with the specified id, or
-  // items().end() if there is no item with the specified id.
-  ShelfItems::const_iterator ItemByID(ShelfID id) const;
-
-  const ShelfItems& items() const { return items_; }
-  int item_count() const { return static_cast<int>(items_.size()); }
-
-  void set_status(Status status) { status_ = status; }
-  Status status() const { return status_; }
-
-  void AddObserver(ShelfModelObserver* observer);
-  void RemoveObserver(ShelfModelObserver* observer);
-
- private:
-  // Makes sure |index| is in line with the type-based order of items. If that
-  // is not the case, adjusts index by shifting it to the valid range and
-  // returns the new value.
-  int ValidateInsertionIndex(ShelfItemType type, int index) const;
-
-  // ID assigned to the next item.
-  ShelfID next_id_;
-
-  ShelfItems items_;
-  Status status_;
-  base::ObserverList<ShelfModelObserver> observers_;
-
-  DISALLOW_COPY_AND_ASSIGN(ShelfModel);
-};
-
-}  // namespace ash
-
-#endif  // ASH_SHELF_SHELF_MODEL_H_