OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_SHELL_DELEGATE_IMPL_H_ | 5 #ifndef ASH_SHELL_SHELL_DELEGATE_IMPL_H_ |
6 #define ASH_SHELL_SHELL_DELEGATE_IMPL_H_ | 6 #define ASH_SHELL_SHELL_DELEGATE_IMPL_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "ash/shell_delegate.h" | 10 #include "ash/shell_delegate.h" |
11 #include "base/compiler_specific.h" | 11 #include "base/compiler_specific.h" |
| 12 #include "base/macros.h" |
12 | 13 |
13 namespace keyboard { | 14 namespace keyboard { |
14 class KeyboardUI; | 15 class KeyboardUI; |
15 } | 16 } |
16 | 17 |
17 namespace ash { | 18 namespace ash { |
18 namespace shell { | 19 namespace shell { |
19 | 20 |
20 class ShelfDelegateImpl; | 21 class ShelfDelegateImpl; |
21 class WindowWatcher; | 22 class WindowWatcher; |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
64 ShelfDelegateImpl* shelf_delegate_; | 65 ShelfDelegateImpl* shelf_delegate_; |
65 scoped_ptr<app_list::AppListViewDelegate> app_list_view_delegate_; | 66 scoped_ptr<app_list::AppListViewDelegate> app_list_view_delegate_; |
66 | 67 |
67 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl); | 68 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl); |
68 }; | 69 }; |
69 | 70 |
70 } // namespace shell | 71 } // namespace shell |
71 } // namespace ash | 72 } // namespace ash |
72 | 73 |
73 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_ | 74 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_ |
OLD | NEW |