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

Side by Side Diff: ash/launcher/launcher_item_delegate_manager.cc

Issue 23606016: Refactor LauncherItemController and LauncherItemDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix for unittest.. 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 unified diff | Download patch
« no previous file with comments | « ash/launcher/launcher_item_delegate_manager.h ('k') | ash/launcher/launcher_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/launcher/launcher_item_delegate_manager.h" 5 #include "ash/launcher/launcher_item_delegate_manager.h"
6 6
7 #include "ash/launcher/launcher_item_delegate.h"
8 #include "ash/launcher/launcher_model.h"
9 #include "ash/shell.h"
7 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/stl_util.h"
8 12
9 namespace ash { 13 namespace ash {
10 14
11 LauncherItemDelegateManager::LauncherItemDelegateManager() { 15 LauncherItemDelegateManager::LauncherItemDelegateManager(
16 ash::LauncherModel* model) : model_(model) {
17 DCHECK(model_);
18 model_->AddObserver(this);
12 } 19 }
13 20
14 LauncherItemDelegateManager::~LauncherItemDelegateManager() { 21 LauncherItemDelegateManager::~LauncherItemDelegateManager() {
22 model_->RemoveObserver(this);
23 STLDeleteContainerPairSecondPointers(id_to_item_delegate_map_.begin(),
24 id_to_item_delegate_map_.end());
15 } 25 }
16 26
17 void LauncherItemDelegateManager::RegisterLauncherItemDelegate( 27 void LauncherItemDelegateManager::SetLauncherItemDelegate(
18 ash::LauncherItemType type, LauncherItemDelegate* item_delegate) { 28 ash::LauncherID id,
19 // When a new |item_delegate| is registered with an exsiting |type|, it will 29 scoped_ptr<LauncherItemDelegate> item_delegate) {
20 // get overwritten. 30 // If another LauncherItemDelegate is already registered for |id|, we assume
21 item_type_to_item_delegate_map_[type] = item_delegate; 31 // that this request is replacing LauncherItemDelegate for |id| with
32 // |item_delegate|.
33 RemoveLauncherItemDelegate(id);
34 id_to_item_delegate_map_[id] = item_delegate.release();
22 } 35 }
23 36
24 LauncherItemDelegate* LauncherItemDelegateManager::GetLauncherItemDelegate( 37 LauncherItemDelegate* LauncherItemDelegateManager::GetLauncherItemDelegate(
25 ash::LauncherItemType item_type) { 38 ash::LauncherID id) {
26 DCHECK(item_type_to_item_delegate_map_.find(item_type) != 39 if (id_to_item_delegate_map_.find(id) != id_to_item_delegate_map_.end())
27 item_type_to_item_delegate_map_.end()); 40 return id_to_item_delegate_map_[id];
28 return item_type_to_item_delegate_map_[item_type]; 41 return NULL;
42 }
43
44 void LauncherItemDelegateManager::LauncherItemAdded(int index) {
45 }
46
47 void LauncherItemDelegateManager::LauncherItemRemoved(int index,
48 ash::LauncherID id) {
49 RemoveLauncherItemDelegate(id);
50 }
51
52 void LauncherItemDelegateManager::LauncherItemMoved(int start_index,
53 int target_index) {
54 }
55
56 void LauncherItemDelegateManager::LauncherItemChanged(
57 int index,
58 const LauncherItem& old_item) {
59 }
60
61 void LauncherItemDelegateManager::LauncherStatusChanged() {
62 }
63
64 void LauncherItemDelegateManager::RemoveLauncherItemDelegate(
65 ash::LauncherID id) {
66 if (id_to_item_delegate_map_.find(id) != id_to_item_delegate_map_.end()) {
67 delete id_to_item_delegate_map_[id];
68 id_to_item_delegate_map_.erase(id);
69 }
29 } 70 }
30 71
31 } // namespace ash 72 } // namespace ash
OLDNEW
« no previous file with comments | « ash/launcher/launcher_item_delegate_manager.h ('k') | ash/launcher/launcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698