| 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/bridge/wm_shell_mus.h" | 5 #include "ash/mus/bridge/wm_shell_mus.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "ash/common/accelerators/accelerator_controller.h" | 9 #include "ash/common/accelerators/accelerator_controller.h" |
| 10 #include "ash/common/key_event_watcher.h" | 10 #include "ash/common/key_event_watcher.h" |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 bool ShouldLockScreenBeforeSuspending() const override { return false; } | 68 bool ShouldLockScreenBeforeSuspending() const override { return false; } |
| 69 void LockScreen() override { | 69 void LockScreen() override { |
| 70 screen_locked_ = true; | 70 screen_locked_ = true; |
| 71 NOTIMPLEMENTED(); | 71 NOTIMPLEMENTED(); |
| 72 } | 72 } |
| 73 void UnlockScreen() override { | 73 void UnlockScreen() override { |
| 74 NOTIMPLEMENTED(); | 74 NOTIMPLEMENTED(); |
| 75 screen_locked_ = false; | 75 screen_locked_ = false; |
| 76 } | 76 } |
| 77 bool IsUserSessionBlocked() const override { return false; } | 77 bool IsUserSessionBlocked() const override { return false; } |
| 78 SessionState GetSessionState() const override { return SESSION_STATE_ACTIVE; } | 78 session_manager::SessionState GetSessionState() const override { |
| 79 return session_manager::SessionState::ACTIVE; |
| 80 } |
| 79 const user_manager::UserInfo* GetUserInfo(UserIndex index) const override { | 81 const user_manager::UserInfo* GetUserInfo(UserIndex index) const override { |
| 80 return user_info_.get(); | 82 return user_info_.get(); |
| 81 } | 83 } |
| 82 bool ShouldShowAvatar(WmWindow* window) const override { | 84 bool ShouldShowAvatar(WmWindow* window) const override { |
| 83 NOTIMPLEMENTED(); | 85 NOTIMPLEMENTED(); |
| 84 return !user_info_->GetImage().isNull(); | 86 return !user_info_->GetImage().isNull(); |
| 85 } | 87 } |
| 86 gfx::ImageSkia GetAvatarImageForWindow(WmWindow* window) const override { | 88 gfx::ImageSkia GetAvatarImageForWindow(WmWindow* window) const override { |
| 87 NOTIMPLEMENTED(); | 89 NOTIMPLEMENTED(); |
| 88 return gfx::ImageSkia(); | 90 return gfx::ImageSkia(); |
| (...skipping 372 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 461 OnWindowActivated(gained_active, lost_active)); | 463 OnWindowActivated(gained_active, lost_active)); |
| 462 } | 464 } |
| 463 | 465 |
| 464 void WmShellMus::OnDidDestroyClient(ui::WindowTreeClient* client) { | 466 void WmShellMus::OnDidDestroyClient(ui::WindowTreeClient* client) { |
| 465 DCHECK_EQ(window_tree_client(), client); | 467 DCHECK_EQ(window_tree_client(), client); |
| 466 client->RemoveObserver(this); | 468 client->RemoveObserver(this); |
| 467 } | 469 } |
| 468 | 470 |
| 469 } // namespace mus | 471 } // namespace mus |
| 470 } // namespace ash | 472 } // namespace ash |
| OLD | NEW |