| 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/sysui/shell_delegate_mus.h" | 5 #include "ash/sysui/shell_delegate_mus.h" |
| 6 | 6 |
| 7 #include "ash/default_accessibility_delegate.h" | 7 #include "ash/default_accessibility_delegate.h" |
| 8 #include "ash/gpu_support_stub.h" | 8 #include "ash/gpu_support_stub.h" |
| 9 #include "ash/media_delegate.h" | 9 #include "ash/media_delegate.h" |
| 10 #include "ash/session/session_state_delegate.h" | 10 #include "ash/session/session_state_delegate.h" |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 } | 49 } |
| 50 void UnlockScreen() override { | 50 void UnlockScreen() override { |
| 51 NOTIMPLEMENTED(); | 51 NOTIMPLEMENTED(); |
| 52 screen_locked_ = false; | 52 screen_locked_ = false; |
| 53 } | 53 } |
| 54 bool IsUserSessionBlocked() const override { return false; } | 54 bool IsUserSessionBlocked() const override { return false; } |
| 55 SessionState GetSessionState() const override { return SESSION_STATE_ACTIVE; } | 55 SessionState GetSessionState() const override { return SESSION_STATE_ACTIVE; } |
| 56 const user_manager::UserInfo* GetUserInfo(UserIndex index) const override { | 56 const user_manager::UserInfo* GetUserInfo(UserIndex index) const override { |
| 57 return user_info_.get(); | 57 return user_info_.get(); |
| 58 } | 58 } |
| 59 bool ShouldShowAvatar(aura::Window* window) const override { | 59 bool ShouldShowAvatar(WmWindow* window) const override { |
| 60 NOTIMPLEMENTED(); |
| 60 return !user_info_->GetImage().isNull(); | 61 return !user_info_->GetImage().isNull(); |
| 61 } | 62 } |
| 62 gfx::ImageSkia GetAvatarImageForWindow(aura::Window* window) const override { | 63 gfx::ImageSkia GetAvatarImageForWindow(WmWindow* window) const override { |
| 64 NOTIMPLEMENTED(); |
| 63 return gfx::ImageSkia(); | 65 return gfx::ImageSkia(); |
| 64 } | 66 } |
| 65 void SwitchActiveUser(const AccountId& account_id) override {} | 67 void SwitchActiveUser(const AccountId& account_id) override {} |
| 66 void CycleActiveUser(CycleUser cycle_user) override {} | 68 void CycleActiveUser(CycleUser cycle_user) override {} |
| 67 bool IsMultiProfileAllowedByPrimaryUserPolicy() const override { | 69 bool IsMultiProfileAllowedByPrimaryUserPolicy() const override { |
| 68 return true; | 70 return true; |
| 69 } | 71 } |
| 70 void AddSessionStateObserver(ash::SessionStateObserver* observer) override {} | 72 void AddSessionStateObserver(ash::SessionStateObserver* observer) override {} |
| 71 void RemoveSessionStateObserver( | 73 void RemoveSessionStateObserver( |
| 72 ash::SessionStateObserver* observer) override {} | 74 ash::SessionStateObserver* observer) override {} |
| (...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 232 return base::string16(); | 234 return base::string16(); |
| 233 } | 235 } |
| 234 | 236 |
| 235 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { | 237 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { |
| 236 NOTIMPLEMENTED(); | 238 NOTIMPLEMENTED(); |
| 237 return gfx::Image(); | 239 return gfx::Image(); |
| 238 } | 240 } |
| 239 | 241 |
| 240 } // namespace sysui | 242 } // namespace sysui |
| 241 } // namespace ash | 243 } // namespace ash |
| OLD | NEW |