| 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 <memory> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 ui::MenuModel* CreateContextMenu(WmShelf* wm_shelf, | 58 ui::MenuModel* CreateContextMenu(WmShelf* wm_shelf, |
| 59 const ShelfItem* item) override; | 59 const ShelfItem* item) override; |
| 60 GPUSupport* CreateGPUSupport() override; | 60 GPUSupport* CreateGPUSupport() override; |
| 61 base::string16 GetProductName() const override; | 61 base::string16 GetProductName() const override; |
| 62 gfx::Image GetDeprecatedAcceleratorImage() const override; | 62 gfx::Image GetDeprecatedAcceleratorImage() const override; |
| 63 PrefService* GetActiveUserPrefService() const override; | 63 PrefService* GetActiveUserPrefService() const override; |
| 64 bool IsTouchscreenEnabledInPrefs(bool use_local_state) const override; | 64 bool IsTouchscreenEnabledInPrefs(bool use_local_state) const override; |
| 65 void SetTouchscreenEnabledInPrefs(bool enabled, | 65 void SetTouchscreenEnabledInPrefs(bool enabled, |
| 66 bool use_local_state) override; | 66 bool use_local_state) override; |
| 67 void UpdateTouchscreenStatusFromPrefs() override; | 67 void UpdateTouchscreenStatusFromPrefs() override; |
| 68 void SuspendMediaSessions() override; |
| 68 | 69 |
| 69 int num_exit_requests() const { return num_exit_requests_; } | 70 int num_exit_requests() const { return num_exit_requests_; } |
| 70 | 71 |
| 71 void SetForceMaximizeOnFirstRun(bool maximize) { | 72 void SetForceMaximizeOnFirstRun(bool maximize) { |
| 72 force_maximize_on_first_run_ = maximize; | 73 force_maximize_on_first_run_ = maximize; |
| 73 } | 74 } |
| 74 | 75 |
| 76 bool media_sessions_suspended() const { return media_sessions_suspended_; } |
| 77 |
| 75 private: | 78 private: |
| 76 int num_exit_requests_; | 79 int num_exit_requests_ = 0; |
| 77 bool multi_profiles_enabled_; | 80 bool multi_profiles_enabled_ = false; |
| 78 bool force_maximize_on_first_run_; | 81 bool force_maximize_on_first_run_ = false; |
| 79 bool touchscreen_enabled_in_local_pref_; | 82 bool touchscreen_enabled_in_local_pref_ = true; |
| 83 bool media_sessions_suspended_ = false; |
| 80 std::unique_ptr<ShelfInitializer> shelf_initializer_; | 84 std::unique_ptr<ShelfInitializer> shelf_initializer_; |
| 81 PrefService* active_user_pref_service_; // Not owned. | 85 PrefService* active_user_pref_service_ = nullptr; // Not owned. |
| 82 | 86 |
| 83 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate); | 87 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate); |
| 84 }; | 88 }; |
| 85 | 89 |
| 86 } // namespace test | 90 } // namespace test |
| 87 } // namespace ash | 91 } // namespace ash |
| 88 | 92 |
| 89 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_ | 93 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_ |
| OLD | NEW |