| 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_WINDOW_WATCHER_ITEM_DELEGATE_H_ | 5 #ifndef ASH_SHELF_SHELF_WINDOW_WATCHER_ITEM_DELEGATE_H_ |
| 6 #define ASH_SHELF_SHELF_WINDOW_WATCHER_ITEM_DELEGATE_H_ | 6 #define ASH_SHELF_SHELF_WINDOW_WATCHER_ITEM_DELEGATE_H_ |
| 7 | 7 |
| 8 #include "ash/shelf/shelf_item_delegate.h" | 8 #include "ash/common/shelf/shelf_item_delegate.h" |
| 9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| 11 | 11 |
| 12 namespace aura { | 12 namespace aura { |
| 13 class Window; | 13 class Window; |
| 14 } | 14 } |
| 15 | 15 |
| 16 namespace ash { | 16 namespace ash { |
| 17 | 17 |
| 18 // ShelfItemDelegate for the items created by ShelfWindowWatcher. | 18 // ShelfItemDelegate for the items created by ShelfWindowWatcher. |
| (...skipping 15 matching lines...) Expand all Loading... |
| 34 | 34 |
| 35 // Stores a Window associated with this item. Not owned. | 35 // Stores a Window associated with this item. Not owned. |
| 36 aura::Window* window_; | 36 aura::Window* window_; |
| 37 | 37 |
| 38 DISALLOW_COPY_AND_ASSIGN(ShelfWindowWatcherItemDelegate); | 38 DISALLOW_COPY_AND_ASSIGN(ShelfWindowWatcherItemDelegate); |
| 39 }; | 39 }; |
| 40 | 40 |
| 41 } // namespace ash | 41 } // namespace ash |
| 42 | 42 |
| 43 #endif // ASH_SHELF_SHELF_WINDOW_WATCHER_ITEM_DELEGATE_H_ | 43 #endif // ASH_SHELF_SHELF_WINDOW_WATCHER_ITEM_DELEGATE_H_ |
| OLD | NEW |