Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(397)

Side by Side Diff: ash/mus/shell_delegate_mus.cc

Issue 2413503002: Cleanup mojo Wallpaper interfaces for mash. (Closed)
Patch Set: Sync and rebase; do *not* use mojo in classic ash. Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 #if defined(OS_CHROMEOS) 182 #if defined(OS_CHROMEOS)
183 return new SystemTrayDelegateMus(); 183 return new SystemTrayDelegateMus();
184 #else 184 #else
185 // Windows and Linux do not support the services required for most system tray 185 // Windows and Linux do not support the services required for most system tray
186 // items. Use the same stub delegate as ash_shell_with_content. 186 // items. Use the same stub delegate as ash_shell_with_content.
187 return new DefaultSystemTrayDelegate(); 187 return new DefaultSystemTrayDelegate();
188 #endif 188 #endif
189 } 189 }
190 190
191 std::unique_ptr<WallpaperDelegate> ShellDelegateMus::CreateWallpaperDelegate() { 191 std::unique_ptr<WallpaperDelegate> ShellDelegateMus::CreateWallpaperDelegate() {
192 return base::MakeUnique<WallpaperDelegateMus>(connector_); 192 return base::MakeUnique<WallpaperDelegateMus>();
193 } 193 }
194 194
195 SessionStateDelegate* ShellDelegateMus::CreateSessionStateDelegate() { 195 SessionStateDelegate* ShellDelegateMus::CreateSessionStateDelegate() {
196 // TODO: http://crbug.com/647416. 196 // TODO: http://crbug.com/647416.
197 NOTIMPLEMENTED() << " Using a stub SessionStateDeleagte implementation"; 197 NOTIMPLEMENTED() << " Using a stub SessionStateDeleagte implementation";
198 return new SessionStateDelegateStub; 198 return new SessionStateDelegateStub;
199 } 199 }
200 200
201 AccessibilityDelegate* ShellDelegateMus::CreateAccessibilityDelegate() { 201 AccessibilityDelegate* ShellDelegateMus::CreateAccessibilityDelegate() {
202 return new AccessibilityDelegateMus(connector_); 202 return new AccessibilityDelegateMus(connector_);
(...skipping 30 matching lines...) Expand all
233 NOTIMPLEMENTED(); 233 NOTIMPLEMENTED();
234 return base::string16(); 234 return base::string16();
235 } 235 }
236 236
237 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { 237 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const {
238 NOTIMPLEMENTED(); 238 NOTIMPLEMENTED();
239 return gfx::Image(); 239 return gfx::Image();
240 } 240 }
241 241
242 } // namespace ash 242 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698