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

Unified Diff: trunk/src/ash/launcher/launcher_item_delegate_manager.cc

Issue 25716004: Revert 226547 "Refactor LauncherItemController and LauncherItemD..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 2 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
Index: trunk/src/ash/launcher/launcher_item_delegate_manager.cc
===================================================================
--- trunk/src/ash/launcher/launcher_item_delegate_manager.cc (revision 226578)
+++ trunk/src/ash/launcher/launcher_item_delegate_manager.cc (working copy)
@@ -4,69 +4,28 @@
#include "ash/launcher/launcher_item_delegate_manager.h"
-#include "ash/launcher/launcher_item_delegate.h"
-#include "ash/launcher/launcher_model.h"
-#include "ash/shell.h"
#include "base/logging.h"
-#include "base/stl_util.h"
namespace ash {
-LauncherItemDelegateManager::LauncherItemDelegateManager(
- ash::LauncherModel* model) : model_(model) {
- DCHECK(model_);
- model_->AddObserver(this);
+LauncherItemDelegateManager::LauncherItemDelegateManager() {
}
LauncherItemDelegateManager::~LauncherItemDelegateManager() {
- model_->RemoveObserver(this);
- STLDeleteContainerPairSecondPointers(id_to_item_delegate_map_.begin(),
- id_to_item_delegate_map_.end());
}
-void LauncherItemDelegateManager::SetLauncherItemDelegate(
- ash::LauncherID id,
- scoped_ptr<LauncherItemDelegate> item_delegate) {
- // If another LauncherItemDelegate is already registered for |id|, we assume
- // that this request is replacing LauncherItemDelegate for |id| with
- // |item_delegate|.
- RemoveLauncherItemDelegate(id);
- id_to_item_delegate_map_[id] = item_delegate.release();
+void LauncherItemDelegateManager::RegisterLauncherItemDelegate(
+ ash::LauncherItemType type, LauncherItemDelegate* item_delegate) {
+ // When a new |item_delegate| is registered with an exsiting |type|, it will
+ // get overwritten.
+ item_type_to_item_delegate_map_[type] = item_delegate;
}
LauncherItemDelegate* LauncherItemDelegateManager::GetLauncherItemDelegate(
- ash::LauncherID id) {
- if (id_to_item_delegate_map_.find(id) != id_to_item_delegate_map_.end())
- return id_to_item_delegate_map_[id];
- return NULL;
+ ash::LauncherItemType item_type) {
+ DCHECK(item_type_to_item_delegate_map_.find(item_type) !=
+ item_type_to_item_delegate_map_.end());
+ return item_type_to_item_delegate_map_[item_type];
}
-void LauncherItemDelegateManager::LauncherItemAdded(int index) {
-}
-
-void LauncherItemDelegateManager::LauncherItemRemoved(int index,
- ash::LauncherID id) {
- RemoveLauncherItemDelegate(id);
-}
-
-void LauncherItemDelegateManager::LauncherItemMoved(int start_index,
- int target_index) {
-}
-
-void LauncherItemDelegateManager::LauncherItemChanged(
- int index,
- const LauncherItem& old_item) {
-}
-
-void LauncherItemDelegateManager::LauncherStatusChanged() {
-}
-
-void LauncherItemDelegateManager::RemoveLauncherItemDelegate(
- ash::LauncherID id) {
- if (id_to_item_delegate_map_.find(id) != id_to_item_delegate_map_.end()) {
- delete id_to_item_delegate_map_[id];
- id_to_item_delegate_map_.erase(id);
- }
-}
-
} // namespace ash
« no previous file with comments | « trunk/src/ash/launcher/launcher_item_delegate_manager.h ('k') | trunk/src/ash/launcher/launcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698