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