| 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 <memory> |
| 8 #include <string> | 9 #include <string> |
| 9 | 10 |
| 10 #include "ash/media_delegate.h" | 11 #include "ash/media_delegate.h" |
| 11 #include "ash/shell_delegate.h" | 12 #include "ash/shell_delegate.h" |
| 12 #include "ash/test/test_session_state_delegate.h" | 13 #include "ash/test/test_session_state_delegate.h" |
| 13 #include "base/compiler_specific.h" | 14 #include "base/compiler_specific.h" |
| 14 #include "base/macros.h" | 15 #include "base/macros.h" |
| 15 #include "base/memory/scoped_ptr.h" | |
| 16 #include "base/observer_list.h" | 16 #include "base/observer_list.h" |
| 17 | 17 |
| 18 namespace keyboard { | 18 namespace keyboard { |
| 19 class KeyboardUI; | 19 class KeyboardUI; |
| 20 } | 20 } |
| 21 | 21 |
| 22 namespace ash { | 22 namespace ash { |
| 23 namespace test { | 23 namespace test { |
| 24 | 24 |
| 25 class TestShellDelegate : public ShellDelegate { | 25 class TestShellDelegate : public ShellDelegate { |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 void SetMediaCaptureState(MediaCaptureState state); | 67 void SetMediaCaptureState(MediaCaptureState state); |
| 68 void SetForceMaximizeOnFirstRun(bool maximize) { | 68 void SetForceMaximizeOnFirstRun(bool maximize) { |
| 69 force_maximize_on_first_run_ = maximize; | 69 force_maximize_on_first_run_ = maximize; |
| 70 } | 70 } |
| 71 | 71 |
| 72 private: | 72 private: |
| 73 int num_exit_requests_; | 73 int num_exit_requests_; |
| 74 bool multi_profiles_enabled_; | 74 bool multi_profiles_enabled_; |
| 75 bool force_maximize_on_first_run_; | 75 bool force_maximize_on_first_run_; |
| 76 | 76 |
| 77 scoped_ptr<app_list::AppListViewDelegate> app_list_view_delegate_; | 77 std::unique_ptr<app_list::AppListViewDelegate> app_list_view_delegate_; |
| 78 | 78 |
| 79 base::ObserverList<ash::VirtualKeyboardStateObserver> | 79 base::ObserverList<ash::VirtualKeyboardStateObserver> |
| 80 keyboard_state_observer_list_; | 80 keyboard_state_observer_list_; |
| 81 | 81 |
| 82 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate); | 82 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate); |
| 83 }; | 83 }; |
| 84 | 84 |
| 85 } // namespace test | 85 } // namespace test |
| 86 } // namespace ash | 86 } // namespace ash |
| 87 | 87 |
| 88 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_ | 88 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_ |
| OLD | NEW |