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

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

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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/shelf/shelf_button.cc ('k') | ash/shelf/shelf_layout_manager.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 #ifndef ASH_SHELF_SHELF_ITEM_DELEGATE_MANAGER_H_ 5 #ifndef ASH_SHELF_SHELF_ITEM_DELEGATE_MANAGER_H_
6 #define ASH_SHELF_SHELF_ITEM_DELEGATE_MANAGER_H_ 6 #define ASH_SHELF_SHELF_ITEM_DELEGATE_MANAGER_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 21 matching lines...) Expand all
32 virtual ~ShelfItemDelegateManager(); 32 virtual ~ShelfItemDelegateManager();
33 33
34 // Set |item_delegate| for |id| and take an ownership. 34 // Set |item_delegate| for |id| and take an ownership.
35 void SetShelfItemDelegate(ShelfID id, 35 void SetShelfItemDelegate(ShelfID id,
36 scoped_ptr<ShelfItemDelegate> item_delegate); 36 scoped_ptr<ShelfItemDelegate> item_delegate);
37 37
38 // Returns ShelfItemDelegate for |item_type|. Always returns non-NULL. 38 // Returns ShelfItemDelegate for |item_type|. Always returns non-NULL.
39 ShelfItemDelegate* GetShelfItemDelegate(ShelfID id); 39 ShelfItemDelegate* GetShelfItemDelegate(ShelfID id);
40 40
41 // ShelfModelObserver overrides: 41 // ShelfModelObserver overrides:
42 virtual void ShelfItemAdded(int model_index) OVERRIDE; 42 virtual void ShelfItemAdded(int model_index) override;
43 virtual void ShelfItemRemoved(int index, ShelfID id) OVERRIDE; 43 virtual void ShelfItemRemoved(int index, ShelfID id) override;
44 virtual void ShelfItemMoved(int start_index, int targetindex) OVERRIDE; 44 virtual void ShelfItemMoved(int start_index, int targetindex) override;
45 virtual void ShelfItemChanged(int index, 45 virtual void ShelfItemChanged(int index,
46 const ShelfItem& old_item) OVERRIDE; 46 const ShelfItem& old_item) override;
47 virtual void ShelfStatusChanged() OVERRIDE; 47 virtual void ShelfStatusChanged() override;
48 48
49 private: 49 private:
50 friend class test::ShelfItemDelegateManagerTestAPI; 50 friend class test::ShelfItemDelegateManagerTestAPI;
51 51
52 typedef std::map<ShelfID, ShelfItemDelegate*> ShelfIDToItemDelegateMap; 52 typedef std::map<ShelfID, ShelfItemDelegate*> ShelfIDToItemDelegateMap;
53 53
54 // Remove and destroy ShelfItemDelegate for |id|. 54 // Remove and destroy ShelfItemDelegate for |id|.
55 void RemoveShelfItemDelegate(ShelfID id); 55 void RemoveShelfItemDelegate(ShelfID id);
56 56
57 // Owned by Shell. 57 // Owned by Shell.
58 ShelfModel* model_; 58 ShelfModel* model_;
59 59
60 ShelfIDToItemDelegateMap id_to_item_delegate_map_; 60 ShelfIDToItemDelegateMap id_to_item_delegate_map_;
61 61
62 DISALLOW_COPY_AND_ASSIGN(ShelfItemDelegateManager); 62 DISALLOW_COPY_AND_ASSIGN(ShelfItemDelegateManager);
63 }; 63 };
64 64
65 } // namespace ash 65 } // namespace ash
66 66
67 #endif // ASH_SHELF_SHELF_ITEM_DELEGATE_MANAGER_H_ 67 #endif // ASH_SHELF_SHELF_ITEM_DELEGATE_MANAGER_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_button.cc ('k') | ash/shelf/shelf_layout_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698