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 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
184 #if defined(OS_CHROMEOS) | 184 #if defined(OS_CHROMEOS) |
185 return new SystemTrayDelegateMus(); | 185 return new SystemTrayDelegateMus(); |
186 #else | 186 #else |
187 // Windows and Linux do not support the services required for most system tray | 187 // Windows and Linux do not support the services required for most system tray |
188 // items. Use the same stub delegate as ash_shell_with_content. | 188 // items. Use the same stub delegate as ash_shell_with_content. |
189 return new DefaultSystemTrayDelegate(); | 189 return new DefaultSystemTrayDelegate(); |
190 #endif | 190 #endif |
191 } | 191 } |
192 | 192 |
193 std::unique_ptr<WallpaperDelegate> ShellDelegateMus::CreateWallpaperDelegate() { | 193 std::unique_ptr<WallpaperDelegate> ShellDelegateMus::CreateWallpaperDelegate() { |
194 return base::MakeUnique<WallpaperDelegateMus>(connector_); | 194 return base::MakeUnique<WallpaperDelegateMus>(); |
195 } | 195 } |
196 | 196 |
197 SessionStateDelegate* ShellDelegateMus::CreateSessionStateDelegate() { | 197 SessionStateDelegate* ShellDelegateMus::CreateSessionStateDelegate() { |
198 // TODO: http://crbug.com/647416. | 198 // TODO: http://crbug.com/647416. |
199 NOTIMPLEMENTED() << " Using a stub SessionStateDeleagte implementation"; | 199 NOTIMPLEMENTED() << " Using a stub SessionStateDeleagte implementation"; |
200 return new SessionStateDelegateStub; | 200 return new SessionStateDelegateStub; |
201 } | 201 } |
202 | 202 |
203 AccessibilityDelegate* ShellDelegateMus::CreateAccessibilityDelegate() { | 203 AccessibilityDelegate* ShellDelegateMus::CreateAccessibilityDelegate() { |
204 return new AccessibilityDelegateMus(connector_); | 204 return new AccessibilityDelegateMus(connector_); |
(...skipping 30 matching lines...) Expand all Loading... |
235 NOTIMPLEMENTED(); | 235 NOTIMPLEMENTED(); |
236 return base::string16(); | 236 return base::string16(); |
237 } | 237 } |
238 | 238 |
239 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { | 239 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { |
240 NOTIMPLEMENTED(); | 240 NOTIMPLEMENTED(); |
241 return gfx::Image(); | 241 return gfx::Image(); |
242 } | 242 } |
243 | 243 |
244 } // namespace ash | 244 } // namespace ash |
OLD | NEW |