| OLD | NEW |
|---|
| 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_MODEL_H_ | 5 #ifndef ASH_SHELF_SHELF_MODEL_H_ |
| 6 #define ASH_SHELF_SHELF_MODEL_H_ | 6 #define ASH_SHELF_SHELF_MODEL_H_ |
| 7 | 7 |
| 8 #include "ash/ash_export.h" | 8 #include "ash/ash_export.h" |
| 9 #include "ash/shelf/shelf_item_types.h" | 9 #include "ash/shelf/shelf_item_types.h" |
| 10 #include "base/basictypes.h" | 10 #include "base/macros.h" |
| 11 #include "base/observer_list.h" | 11 #include "base/observer_list.h" |
| 12 | 12 |
| 13 namespace ash { | 13 namespace ash { |
| 14 | 14 |
| 15 class ShelfModelObserver; | 15 class ShelfModelObserver; |
| 16 | 16 |
| 17 // Model used by ShelfView. | 17 // Model used by ShelfView. |
| 18 class ASH_EXPORT ShelfModel { | 18 class ASH_EXPORT ShelfModel { |
| 19 public: | 19 public: |
| 20 enum Status { | 20 enum Status { |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 92 ShelfItems items_; | 92 ShelfItems items_; |
| 93 Status status_; | 93 Status status_; |
| 94 base::ObserverList<ShelfModelObserver> observers_; | 94 base::ObserverList<ShelfModelObserver> observers_; |
| 95 | 95 |
| 96 DISALLOW_COPY_AND_ASSIGN(ShelfModel); | 96 DISALLOW_COPY_AND_ASSIGN(ShelfModel); |
| 97 }; | 97 }; |
| 98 | 98 |
| 99 } // namespace ash | 99 } // namespace ash |
| 100 | 100 |
| 101 #endif // ASH_SHELF_SHELF_MODEL_H_ | 101 #endif // ASH_SHELF_SHELF_MODEL_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1540753002:
Switch to standard integer types in ash/. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master