| 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 #include "ash/test/test_shell_delegate.h" | 5 #include "ash/test/test_shell_delegate.h" |
| 6 | 6 |
| 7 #include <limits> | 7 #include <limits> |
| 8 | 8 |
| 9 #include "ash/gpu_support_stub.h" | 9 #include "ash/gpu_support_stub.h" |
| 10 #include "ash/palette_delegate.h" | 10 #include "ash/palette_delegate.h" |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 shelf->SetAlignment(SHELF_ALIGNMENT_BOTTOM); | 45 shelf->SetAlignment(SHELF_ALIGNMENT_BOTTOM); |
| 46 shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_NEVER); | 46 shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_NEVER); |
| 47 shelf->UpdateVisibilityState(); | 47 shelf->UpdateVisibilityState(); |
| 48 } | 48 } |
| 49 } | 49 } |
| 50 | 50 |
| 51 private: | 51 private: |
| 52 DISALLOW_COPY_AND_ASSIGN(ShelfInitializer); | 52 DISALLOW_COPY_AND_ASSIGN(ShelfInitializer); |
| 53 }; | 53 }; |
| 54 | 54 |
| 55 TestShellDelegate::TestShellDelegate() | 55 TestShellDelegate::TestShellDelegate() = default; |
| 56 : num_exit_requests_(0), | |
| 57 multi_profiles_enabled_(false), | |
| 58 force_maximize_on_first_run_(false), | |
| 59 touchscreen_enabled_in_local_pref_(true), | |
| 60 active_user_pref_service_(nullptr) {} | |
| 61 | 56 |
| 62 TestShellDelegate::~TestShellDelegate() {} | 57 TestShellDelegate::~TestShellDelegate() = default; |
| 63 | 58 |
| 64 ::service_manager::Connector* TestShellDelegate::GetShellConnector() const { | 59 ::service_manager::Connector* TestShellDelegate::GetShellConnector() const { |
| 65 return nullptr; | 60 return nullptr; |
| 66 } | 61 } |
| 67 | 62 |
| 68 bool TestShellDelegate::IsIncognitoAllowed() const { | 63 bool TestShellDelegate::IsIncognitoAllowed() const { |
| 69 return true; | 64 return true; |
| 70 } | 65 } |
| 71 | 66 |
| 72 bool TestShellDelegate::IsMultiProfilesEnabled() const { | 67 bool TestShellDelegate::IsMultiProfilesEnabled() const { |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 152 } | 147 } |
| 153 | 148 |
| 154 void TestShellDelegate::SetTouchscreenEnabledInPrefs(bool enabled, | 149 void TestShellDelegate::SetTouchscreenEnabledInPrefs(bool enabled, |
| 155 bool use_local_state) { | 150 bool use_local_state) { |
| 156 if (use_local_state) | 151 if (use_local_state) |
| 157 touchscreen_enabled_in_local_pref_ = enabled; | 152 touchscreen_enabled_in_local_pref_ = enabled; |
| 158 } | 153 } |
| 159 | 154 |
| 160 void TestShellDelegate::UpdateTouchscreenStatusFromPrefs() {} | 155 void TestShellDelegate::UpdateTouchscreenStatusFromPrefs() {} |
| 161 | 156 |
| 157 void TestShellDelegate::SuspendMediaSessions() { |
| 158 media_sessions_suspended_ = true; |
| 159 } |
| 160 |
| 162 } // namespace test | 161 } // namespace test |
| 163 } // namespace ash | 162 } // namespace ash |
| OLD | NEW |