| 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 "base/compiler_specific.h" | 12 #include "base/compiler_specific.h" |
| 13 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
| 14 #include "base/observer_list.h" |
| 14 | 15 |
| 15 namespace keyboard { | 16 namespace keyboard { |
| 16 class KeyboardControllerProxy; | 17 class KeyboardControllerProxy; |
| 17 } | 18 } |
| 18 | 19 |
| 19 namespace ash { | 20 namespace ash { |
| 20 namespace test { | 21 namespace test { |
| 21 | 22 |
| 22 class TestSessionStateDelegate; | 23 class TestSessionStateDelegate; |
| 23 | 24 |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 } | 70 } |
| 70 | 71 |
| 71 void SetMediaCaptureState(MediaCaptureState state); | 72 void SetMediaCaptureState(MediaCaptureState state); |
| 72 | 73 |
| 73 private: | 74 private: |
| 74 int num_exit_requests_; | 75 int num_exit_requests_; |
| 75 bool multi_profiles_enabled_; | 76 bool multi_profiles_enabled_; |
| 76 | 77 |
| 77 scoped_ptr<content::BrowserContext> active_browser_context_; | 78 scoped_ptr<content::BrowserContext> active_browser_context_; |
| 78 | 79 |
| 80 ObserverList<ash::VirtualKeyboardStateObserver> keyboard_state_observer_list_; |
| 81 |
| 79 TestSessionStateDelegate* test_session_state_delegate_; // Not owned. | 82 TestSessionStateDelegate* test_session_state_delegate_; // Not owned. |
| 80 | 83 |
| 81 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate); | 84 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate); |
| 82 }; | 85 }; |
| 83 | 86 |
| 84 } // namespace test | 87 } // namespace test |
| 85 } // namespace ash | 88 } // namespace ash |
| 86 | 89 |
| 87 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_ | 90 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_ |
| OLD | NEW |