| 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" |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 }; | 69 }; |
| 70 | 70 |
| 71 private: | 71 private: |
| 72 int num_exit_requests_; | 72 int num_exit_requests_; |
| 73 bool multi_profiles_enabled_; | 73 bool multi_profiles_enabled_; |
| 74 bool force_maximize_on_first_run_; | 74 bool force_maximize_on_first_run_; |
| 75 | 75 |
| 76 scoped_ptr<content::BrowserContext> active_browser_context_; | 76 scoped_ptr<content::BrowserContext> active_browser_context_; |
| 77 scoped_ptr<app_list::AppListViewDelegate> app_list_view_delegate_; | 77 scoped_ptr<app_list::AppListViewDelegate> app_list_view_delegate_; |
| 78 | 78 |
| 79 ObserverList<ash::VirtualKeyboardStateObserver> keyboard_state_observer_list_; | 79 base::ObserverList<ash::VirtualKeyboardStateObserver> |
| 80 keyboard_state_observer_list_; |
| 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 |