| 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/shell/shell_delegate_impl.h" | 5 #include "ash/shell/shell_delegate_impl.h" |
| 6 | 6 |
| 7 #include "ash/accessibility_delegate.h" | 7 #include "ash/accessibility_delegate.h" |
| 8 #include "ash/default_accessibility_delegate.h" | 8 #include "ash/default_accessibility_delegate.h" |
| 9 #include "ash/default_user_wallpaper_delegate.h" | 9 #include "ash/default_user_wallpaper_delegate.h" |
| 10 #include "ash/gpu_support_stub.h" | 10 #include "ash/gpu_support_stub.h" |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 return true; | 122 return true; |
| 123 } | 123 } |
| 124 void AddSessionStateObserver(ash::SessionStateObserver* observer) override {} | 124 void AddSessionStateObserver(ash::SessionStateObserver* observer) override {} |
| 125 void RemoveSessionStateObserver( | 125 void RemoveSessionStateObserver( |
| 126 ash::SessionStateObserver* observer) override {} | 126 ash::SessionStateObserver* observer) override {} |
| 127 | 127 |
| 128 private: | 128 private: |
| 129 bool screen_locked_; | 129 bool screen_locked_; |
| 130 | 130 |
| 131 // A pseudo user info. | 131 // A pseudo user info. |
| 132 scoped_ptr<user_manager::UserInfo> user_info_; | 132 std::unique_ptr<user_manager::UserInfo> user_info_; |
| 133 | 133 |
| 134 DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateImpl); | 134 DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateImpl); |
| 135 }; | 135 }; |
| 136 | 136 |
| 137 } // namespace | 137 } // namespace |
| 138 | 138 |
| 139 ShellDelegateImpl::ShellDelegateImpl() : shelf_delegate_(nullptr) {} | 139 ShellDelegateImpl::ShellDelegateImpl() : shelf_delegate_(nullptr) {} |
| 140 | 140 |
| 141 ShellDelegateImpl::~ShellDelegateImpl() {} | 141 ShellDelegateImpl::~ShellDelegateImpl() {} |
| 142 | 142 |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 240 base::string16 ShellDelegateImpl::GetProductName() const { | 240 base::string16 ShellDelegateImpl::GetProductName() const { |
| 241 return base::string16(); | 241 return base::string16(); |
| 242 } | 242 } |
| 243 | 243 |
| 244 gfx::Image ShellDelegateImpl::GetDeprecatedAcceleratorImage() const { | 244 gfx::Image ShellDelegateImpl::GetDeprecatedAcceleratorImage() const { |
| 245 return gfx::Image(); | 245 return gfx::Image(); |
| 246 } | 246 } |
| 247 | 247 |
| 248 } // namespace shell | 248 } // namespace shell |
| 249 } // namespace ash | 249 } // namespace ash |
| OLD | NEW |