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_SHELL_SHELF_DELEGATE_IMPL_H_ | 5 #ifndef ASH_SHELL_SHELF_DELEGATE_IMPL_H_ |
6 #define ASH_SHELL_SHELF_DELEGATE_IMPL_H_ | 6 #define ASH_SHELL_SHELF_DELEGATE_IMPL_H_ |
7 | 7 |
8 #include "ash/shelf/shelf_delegate.h" | 8 #include "ash/shelf/shelf_delegate.h" |
9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
| 10 #include "base/macros.h" |
10 | 11 |
11 namespace aura { | 12 namespace aura { |
12 class Window; | 13 class Window; |
13 } | 14 } |
14 | 15 |
15 namespace ash { | 16 namespace ash { |
16 namespace shell { | 17 namespace shell { |
17 | 18 |
18 class WindowWatcher; | 19 class WindowWatcher; |
19 | 20 |
(...skipping 18 matching lines...) Expand all Loading... |
38 // Used to update Launcher. Owned by main. | 39 // Used to update Launcher. Owned by main. |
39 WindowWatcher* watcher_; | 40 WindowWatcher* watcher_; |
40 | 41 |
41 DISALLOW_COPY_AND_ASSIGN(ShelfDelegateImpl); | 42 DISALLOW_COPY_AND_ASSIGN(ShelfDelegateImpl); |
42 }; | 43 }; |
43 | 44 |
44 } // namespace shell | 45 } // namespace shell |
45 } // namespace ash | 46 } // namespace ash |
46 | 47 |
47 #endif // ASH_SHELL_SHELF_DELEGATE_IMPL_H_ | 48 #endif // ASH_SHELL_SHELF_DELEGATE_IMPL_H_ |
OLD | NEW |