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

Side by Side Diff: ash/common/shelf/shelf_item_delegate_manager.h

Issue 2046513003: mash: Move shelf model and item classes to ash/common/shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@initshelfearly
Patch Set: Created 4 years, 6 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/common/shelf/shelf_item_delegate.h ('k') | ash/common/shelf/shelf_item_delegate_manager.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 #ifndef ASH_SHELF_SHELF_ITEM_DELEGATE_MANAGER_H_ 5 #ifndef ASH_COMMON_SHELF_SHELF_ITEM_DELEGATE_MANAGER_H_
6 #define ASH_SHELF_SHELF_ITEM_DELEGATE_MANAGER_H_ 6 #define ASH_COMMON_SHELF_SHELF_ITEM_DELEGATE_MANAGER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory> 9 #include <memory>
10 10
11 #include "ash/ash_export.h" 11 #include "ash/ash_export.h"
12 #include "ash/shelf/shelf_item_types.h" 12 #include "ash/common/shelf/shelf_item_types.h"
13 #include "ash/shelf/shelf_model_observer.h" 13 #include "ash/common/shelf/shelf_model_observer.h"
14 #include "base/compiler_specific.h"
15 #include "base/macros.h" 14 #include "base/macros.h"
16 #include "base/observer_list.h" 15 #include "base/observer_list.h"
17 16
18 namespace ash { 17 namespace ash {
19 class ShelfItemDelegate; 18 class ShelfItemDelegate;
20 class ShelfModel; 19 class ShelfModel;
21 20
22 namespace test { 21 namespace test {
23 class ShelfItemDelegateManagerTestAPI; 22 class ShelfItemDelegateManagerTestAPI;
24 } 23 }
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 74
76 ShelfIDToItemDelegateMap id_to_item_delegate_map_; 75 ShelfIDToItemDelegateMap id_to_item_delegate_map_;
77 76
78 base::ObserverList<ShelfItemDelegateManagerObserver> observers_; 77 base::ObserverList<ShelfItemDelegateManagerObserver> observers_;
79 78
80 DISALLOW_COPY_AND_ASSIGN(ShelfItemDelegateManager); 79 DISALLOW_COPY_AND_ASSIGN(ShelfItemDelegateManager);
81 }; 80 };
82 81
83 } // namespace ash 82 } // namespace ash
84 83
85 #endif // ASH_SHELF_SHELF_ITEM_DELEGATE_MANAGER_H_ 84 #endif // ASH_COMMON_SHELF_SHELF_ITEM_DELEGATE_MANAGER_H_
OLDNEW
« no previous file with comments | « ash/common/shelf/shelf_item_delegate.h ('k') | ash/common/shelf/shelf_item_delegate_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698