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

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

Issue 71653003: ash: Rename LauncherModel to ShelfModel. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chrome changes Created 7 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « ash/launcher/launcher_item_delegate_manager.h ('k') | ash/launcher/launcher_model.h » ('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" 7 #include "ash/launcher/launcher_item_delegate.h"
8 #include "ash/launcher/launcher_model.h" 8 #include "ash/shelf/shelf_model.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/stl_util.h" 11 #include "base/stl_util.h"
12 12
13 namespace ash { 13 namespace ash {
14 14
15 LauncherItemDelegateManager::LauncherItemDelegateManager( 15 LauncherItemDelegateManager::LauncherItemDelegateManager(ShelfModel* model)
16 ash::LauncherModel* model) : model_(model) { 16 : model_(model) {
17 DCHECK(model_); 17 DCHECK(model_);
18 model_->AddObserver(this); 18 model_->AddObserver(this);
19 } 19 }
20 20
21 LauncherItemDelegateManager::~LauncherItemDelegateManager() { 21 LauncherItemDelegateManager::~LauncherItemDelegateManager() {
22 model_->RemoveObserver(this); 22 model_->RemoveObserver(this);
23 STLDeleteContainerPairSecondPointers(id_to_item_delegate_map_.begin(), 23 STLDeleteContainerPairSecondPointers(id_to_item_delegate_map_.begin(),
24 id_to_item_delegate_map_.end()); 24 id_to_item_delegate_map_.end());
25 } 25 }
26 26
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 65
66 void LauncherItemDelegateManager::RemoveLauncherItemDelegate( 66 void LauncherItemDelegateManager::RemoveLauncherItemDelegate(
67 ash::LauncherID id) { 67 ash::LauncherID id) {
68 if (id_to_item_delegate_map_.find(id) != id_to_item_delegate_map_.end()) { 68 if (id_to_item_delegate_map_.find(id) != id_to_item_delegate_map_.end()) {
69 delete id_to_item_delegate_map_[id]; 69 delete id_to_item_delegate_map_[id];
70 id_to_item_delegate_map_.erase(id); 70 id_to_item_delegate_map_.erase(id);
71 } 71 }
72 } 72 }
73 73
74 } // namespace ash 74 } // namespace ash
OLDNEW
« no previous file with comments | « ash/launcher/launcher_item_delegate_manager.h ('k') | ash/launcher/launcher_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698