| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/mus/shell_delegate_mus.h" | 5 #include "ash/mus/shell_delegate_mus.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "ash/common/gpu_support_stub.h" | 9 #include "ash/common/gpu_support_stub.h" |
| 10 #include "ash/common/media_delegate.h" | 10 #include "ash/common/media_delegate.h" |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 bool ShouldLockScreenBeforeSuspending() const override { return false; } | 51 bool ShouldLockScreenBeforeSuspending() const override { return false; } |
| 52 void LockScreen() override { | 52 void LockScreen() override { |
| 53 screen_locked_ = true; | 53 screen_locked_ = true; |
| 54 NOTIMPLEMENTED(); | 54 NOTIMPLEMENTED(); |
| 55 } | 55 } |
| 56 void UnlockScreen() override { | 56 void UnlockScreen() override { |
| 57 NOTIMPLEMENTED(); | 57 NOTIMPLEMENTED(); |
| 58 screen_locked_ = false; | 58 screen_locked_ = false; |
| 59 } | 59 } |
| 60 bool IsUserSessionBlocked() const override { return false; } | 60 bool IsUserSessionBlocked() const override { return false; } |
| 61 SessionState GetSessionState() const override { return SESSION_STATE_ACTIVE; } | 61 session_manager::SessionState GetSessionState() const override { |
| 62 return session_manager::SessionState::ACTIVE; |
| 63 } |
| 62 const user_manager::UserInfo* GetUserInfo(UserIndex index) const override { | 64 const user_manager::UserInfo* GetUserInfo(UserIndex index) const override { |
| 63 return user_info_.get(); | 65 return user_info_.get(); |
| 64 } | 66 } |
| 65 bool ShouldShowAvatar(WmWindow* window) const override { | 67 bool ShouldShowAvatar(WmWindow* window) const override { |
| 66 NOTIMPLEMENTED(); | 68 NOTIMPLEMENTED(); |
| 67 return !user_info_->GetImage().isNull(); | 69 return !user_info_->GetImage().isNull(); |
| 68 } | 70 } |
| 69 gfx::ImageSkia GetAvatarImageForWindow(WmWindow* window) const override { | 71 gfx::ImageSkia GetAvatarImageForWindow(WmWindow* window) const override { |
| 70 NOTIMPLEMENTED(); | 72 NOTIMPLEMENTED(); |
| 71 return gfx::ImageSkia(); | 73 return gfx::ImageSkia(); |
| (...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 233 NOTIMPLEMENTED(); | 235 NOTIMPLEMENTED(); |
| 234 return base::string16(); | 236 return base::string16(); |
| 235 } | 237 } |
| 236 | 238 |
| 237 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { | 239 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { |
| 238 NOTIMPLEMENTED(); | 240 NOTIMPLEMENTED(); |
| 239 return gfx::Image(); | 241 return gfx::Image(); |
| 240 } | 242 } |
| 241 | 243 |
| 242 } // namespace ash | 244 } // namespace ash |
| OLD | NEW |