| 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 "ash/default_accessibility_delegate.h" | 7 #include "ash/default_accessibility_delegate.h" |
| 8 #include "ash/default_user_wallpaper_delegate.h" | 8 #include "ash/default_user_wallpaper_delegate.h" |
| 9 #include "ash/gpu_support_stub.h" | 9 #include "ash/gpu_support_stub.h" |
| 10 #include "ash/media_delegate.h" | 10 #include "ash/media_delegate.h" |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 return true; | 63 return true; |
| 64 } | 64 } |
| 65 void AddSessionStateObserver(ash::SessionStateObserver* observer) override {} | 65 void AddSessionStateObserver(ash::SessionStateObserver* observer) override {} |
| 66 void RemoveSessionStateObserver( | 66 void RemoveSessionStateObserver( |
| 67 ash::SessionStateObserver* observer) override {} | 67 ash::SessionStateObserver* observer) override {} |
| 68 | 68 |
| 69 private: | 69 private: |
| 70 bool screen_locked_; | 70 bool screen_locked_; |
| 71 | 71 |
| 72 // A pseudo user info. | 72 // A pseudo user info. |
| 73 scoped_ptr<user_manager::UserInfo> user_info_; | 73 std::unique_ptr<user_manager::UserInfo> user_info_; |
| 74 | 74 |
| 75 DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateStub); | 75 DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateStub); |
| 76 }; | 76 }; |
| 77 | 77 |
| 78 class MediaDelegateStub : public MediaDelegate { | 78 class MediaDelegateStub : public MediaDelegate { |
| 79 public: | 79 public: |
| 80 MediaDelegateStub() {} | 80 MediaDelegateStub() {} |
| 81 ~MediaDelegateStub() override {} | 81 ~MediaDelegateStub() override {} |
| 82 | 82 |
| 83 // MediaDelegate: | 83 // MediaDelegate: |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 218 return base::string16(); | 218 return base::string16(); |
| 219 } | 219 } |
| 220 | 220 |
| 221 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { | 221 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { |
| 222 NOTIMPLEMENTED(); | 222 NOTIMPLEMENTED(); |
| 223 return gfx::Image(); | 223 return gfx::Image(); |
| 224 } | 224 } |
| 225 | 225 |
| 226 } // namespace sysui | 226 } // namespace sysui |
| 227 } // namespace ash | 227 } // namespace ash |
| OLD | NEW |