Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1434)

Unified Diff: ash/common/shelf/shelf_model.cc

Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/shelf/shelf_model.h ('k') | ash/common/shelf/shelf_model_observer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/shelf/shelf_model.cc
diff --git a/ash/common/shelf/shelf_model.cc b/ash/common/shelf/shelf_model.cc
deleted file mode 100644
index a68447588ef940cf69fbaea5d4fdcd7b25dacd86..0000000000000000000000000000000000000000
--- a/ash/common/shelf/shelf_model.cc
+++ /dev/null
@@ -1,211 +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.
-
-#include "ash/common/shelf/shelf_model.h"
-
-#include <algorithm>
-
-#include "ash/common/shelf/shelf_item_delegate.h"
-#include "ash/common/shelf/shelf_model_observer.h"
-
-namespace ash {
-
-namespace {
-
-int ShelfItemTypeToWeight(ShelfItemType type) {
- switch (type) {
- case TYPE_APP_LIST:
- // TODO(skuhne): If the app list item becomes movable again, this need
- // to be a fallthrough.
- return 0;
- case TYPE_BROWSER_SHORTCUT:
- case TYPE_APP_SHORTCUT:
- return 1;
- case TYPE_APP:
- return 2;
- case TYPE_DIALOG:
- return 3;
- case TYPE_APP_PANEL:
- return 4;
- case TYPE_UNDEFINED:
- NOTREACHED() << "ShelfItemType must be set";
- return -1;
- }
-
- NOTREACHED() << "Invalid type " << type;
- return 1;
-}
-
-bool CompareByWeight(const ShelfItem& a, const ShelfItem& b) {
- return ShelfItemTypeToWeight(a.type) < ShelfItemTypeToWeight(b.type);
-}
-
-} // namespace
-
-ShelfModel::ShelfModel() : next_id_(1) {}
-
-ShelfModel::~ShelfModel() {}
-
-void ShelfModel::DestroyItemDelegates() {
- // Some ShelfItemDelegates access this model in their destructors and hence
- // need early cleanup.
- id_to_item_delegate_map_.clear();
-}
-
-int ShelfModel::Add(const ShelfItem& item) {
- return AddAt(items_.size(), item);
-}
-
-int ShelfModel::AddAt(int index, const ShelfItem& item) {
- index = ValidateInsertionIndex(item.type, index);
- items_.insert(items_.begin() + index, item);
- items_[index].id = next_id_++;
- for (auto& observer : observers_)
- observer.ShelfItemAdded(index);
- return index;
-}
-
-void ShelfModel::RemoveItemAt(int index) {
- DCHECK(index >= 0 && index < item_count());
- ShelfID id = items_[index].id;
- items_.erase(items_.begin() + index);
- RemoveShelfItemDelegate(id);
- // TODO(jamescook): Fold this into ShelfItemRemoved in existing observers.
- for (auto& observer : observers_)
- observer.OnSetShelfItemDelegate(id, nullptr);
- for (auto& observer : observers_)
- observer.ShelfItemRemoved(index, id);
-}
-
-void ShelfModel::Move(int index, int target_index) {
- if (index == target_index)
- return;
- // TODO: this needs to enforce valid ranges.
- ShelfItem item(items_[index]);
- items_.erase(items_.begin() + index);
- items_.insert(items_.begin() + target_index, item);
- for (auto& observer : observers_)
- observer.ShelfItemMoved(index, target_index);
-}
-
-void ShelfModel::Set(int index, const ShelfItem& item) {
- if (index < 0 || index >= item_count()) {
- NOTREACHED();
- return;
- }
-
- int new_index = item.type == items_[index].type
- ? index
- : ValidateInsertionIndex(item.type, index);
-
- ShelfItem old_item(items_[index]);
- items_[index] = item;
- items_[index].id = old_item.id;
- for (auto& observer : observers_)
- observer.ShelfItemChanged(index, old_item);
-
- // If the type changes confirm that the item is still in the right order.
- if (new_index != index) {
- // The move function works by removing one item and then inserting it at the
- // new location. However - by removing the item first the order will change
- // so that our target index needs to be corrected.
- // TODO(skuhne): Moving this into the Move function breaks lots of unit
- // tests. So several functions were already using this incorrectly.
- // That needs to be cleaned up.
- if (index < new_index)
- new_index--;
-
- Move(index, new_index);
- }
-}
-
-int ShelfModel::ItemIndexByID(ShelfID id) const {
- ShelfItems::const_iterator i = ItemByID(id);
- return i == items_.end() ? -1 : static_cast<int>(i - items_.begin());
-}
-
-int ShelfModel::GetItemIndexForType(ShelfItemType type) {
- for (size_t i = 0; i < items_.size(); ++i) {
- if (items_[i].type == type)
- return i;
- }
- return -1;
-}
-
-ShelfItems::const_iterator ShelfModel::ItemByID(int id) const {
- for (ShelfItems::const_iterator i = items_.begin(); i != items_.end(); ++i) {
- if (i->id == id)
- return i;
- }
- return items_.end();
-}
-
-int ShelfModel::FirstRunningAppIndex() const {
- ShelfItem weight_dummy;
- weight_dummy.type = TYPE_APP;
- return std::lower_bound(items_.begin(), items_.end(), weight_dummy,
- CompareByWeight) -
- items_.begin();
-}
-
-int ShelfModel::FirstPanelIndex() const {
- ShelfItem weight_dummy;
- weight_dummy.type = TYPE_APP_PANEL;
- return std::lower_bound(items_.begin(), items_.end(), weight_dummy,
- CompareByWeight) -
- items_.begin();
-}
-
-void ShelfModel::SetShelfItemDelegate(
- ShelfID id,
- std::unique_ptr<ShelfItemDelegate> item_delegate) {
- // If another ShelfItemDelegate is already registered for |id|, we assume
- // that this request is replacing ShelfItemDelegate for |id| with
- // |item_delegate|.
- RemoveShelfItemDelegate(id);
-
- for (auto& observer : observers_)
- observer.OnSetShelfItemDelegate(id, item_delegate.get());
-
- id_to_item_delegate_map_[id] = std::move(item_delegate);
-}
-
-ShelfItemDelegate* ShelfModel::GetShelfItemDelegate(ShelfID id) {
- if (id_to_item_delegate_map_.find(id) != id_to_item_delegate_map_.end())
- return id_to_item_delegate_map_[id].get();
- return nullptr;
-}
-
-void ShelfModel::AddObserver(ShelfModelObserver* observer) {
- observers_.AddObserver(observer);
-}
-
-void ShelfModel::RemoveObserver(ShelfModelObserver* observer) {
- observers_.RemoveObserver(observer);
-}
-
-int ShelfModel::ValidateInsertionIndex(ShelfItemType type, int index) const {
- DCHECK(index >= 0 && index <= item_count() + 1);
-
- // Clamp |index| to the allowed range for the type as determined by |weight|.
- ShelfItem weight_dummy;
- weight_dummy.type = type;
- index = std::max(std::lower_bound(items_.begin(), items_.end(), weight_dummy,
- CompareByWeight) -
- items_.begin(),
- static_cast<ShelfItems::difference_type>(index));
- index = std::min(std::upper_bound(items_.begin(), items_.end(), weight_dummy,
- CompareByWeight) -
- items_.begin(),
- static_cast<ShelfItems::difference_type>(index));
-
- return index;
-}
-
-void ShelfModel::RemoveShelfItemDelegate(ShelfID id) {
- if (id_to_item_delegate_map_.find(id) != id_to_item_delegate_map_.end())
- id_to_item_delegate_map_.erase(id);
-}
-
-} // namespace ash
« no previous file with comments | « ash/common/shelf/shelf_model.h ('k') | ash/common/shelf/shelf_model_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698