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_TEST_TEST_SHELL_DELEGATE_H_ | 5 #ifndef ASH_TEST_TEST_SHELL_DELEGATE_H_ |
6 #define ASH_TEST_TEST_SHELL_DELEGATE_H_ | 6 #define ASH_TEST_TEST_SHELL_DELEGATE_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "ash/media_delegate.h" | 10 #include "ash/media_delegate.h" |
11 #include "ash/shell_delegate.h" | 11 #include "ash/shell_delegate.h" |
12 #include "ash/test/test_session_state_delegate.h" | 12 #include "ash/test/test_session_state_delegate.h" |
13 #include "base/compiler_specific.h" | 13 #include "base/compiler_specific.h" |
| 14 #include "base/macros.h" |
14 #include "base/memory/scoped_ptr.h" | 15 #include "base/memory/scoped_ptr.h" |
15 #include "base/observer_list.h" | 16 #include "base/observer_list.h" |
16 | 17 |
17 namespace keyboard { | 18 namespace keyboard { |
18 class KeyboardUI; | 19 class KeyboardUI; |
19 } | 20 } |
20 | 21 |
21 namespace ash { | 22 namespace ash { |
22 namespace test { | 23 namespace test { |
23 | 24 |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
80 | 81 |
81 TestSessionStateDelegate* test_session_state_delegate_; // Not owned. | 82 TestSessionStateDelegate* test_session_state_delegate_; // Not owned. |
82 | 83 |
83 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate); | 84 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate); |
84 }; | 85 }; |
85 | 86 |
86 } // namespace test | 87 } // namespace test |
87 } // namespace ash | 88 } // namespace ash |
88 | 89 |
89 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_ | 90 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_ |
OLD | NEW |