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

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

Issue 2323063003: mash: Port sysui's WallpaperDelegateMus to mojo:ash. (Closed)
Patch Set: Alternative display info workaround. Created 4 years, 3 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/sysui/shell_delegate_mus.h" 5 #include "ash/sysui/shell_delegate_mus.h"
6 6
7 #include "ash/common/default_accessibility_delegate.h" 7 #include "ash/common/default_accessibility_delegate.h"
8 #include "ash/common/gpu_support_stub.h" 8 #include "ash/common/gpu_support_stub.h"
9 #include "ash/common/media_delegate.h" 9 #include "ash/common/media_delegate.h"
10 #include "ash/common/palette_delegate.h" 10 #include "ash/common/palette_delegate.h"
11 #include "ash/common/session/session_state_delegate.h" 11 #include "ash/common/session/session_state_delegate.h"
12 #include "ash/common/system/tray/default_system_tray_delegate.h" 12 #include "ash/common/system/tray/default_system_tray_delegate.h"
13 #include "ash/common/wallpaper/wallpaper_delegate.h"
13 #include "ash/sysui/app_list_presenter_mus.h" 14 #include "ash/sysui/app_list_presenter_mus.h"
14 #include "ash/sysui/wallpaper_delegate_mus.h"
15 #include "base/memory/ptr_util.h" 15 #include "base/memory/ptr_util.h"
16 #include "base/strings/string16.h" 16 #include "base/strings/string16.h"
17 #include "components/user_manager/user_info_impl.h" 17 #include "components/user_manager/user_info_impl.h"
18 #include "ui/app_list/presenter/app_list_presenter.h" 18 #include "ui/app_list/presenter/app_list_presenter.h"
19 #include "ui/gfx/image/image.h" 19 #include "ui/gfx/image/image.h"
20 20
21 namespace ash { 21 namespace ash {
22 namespace sysui { 22 namespace sysui {
23 23
24 namespace { 24 namespace {
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 ShelfDelegate* ShellDelegateMus::CreateShelfDelegate(ShelfModel* model) { 163 ShelfDelegate* ShellDelegateMus::CreateShelfDelegate(ShelfModel* model) {
164 return nullptr; 164 return nullptr;
165 } 165 }
166 166
167 SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() { 167 SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() {
168 NOTIMPLEMENTED() << " Using the default SystemTrayDelegate implementation"; 168 NOTIMPLEMENTED() << " Using the default SystemTrayDelegate implementation";
169 return new DefaultSystemTrayDelegate; 169 return new DefaultSystemTrayDelegate;
170 } 170 }
171 171
172 std::unique_ptr<WallpaperDelegate> ShellDelegateMus::CreateWallpaperDelegate() { 172 std::unique_ptr<WallpaperDelegate> ShellDelegateMus::CreateWallpaperDelegate() {
173 return base::MakeUnique<WallpaperDelegateMus>(); 173 NOTIMPLEMENTED();
174 return nullptr;
174 } 175 }
175 176
176 SessionStateDelegate* ShellDelegateMus::CreateSessionStateDelegate() { 177 SessionStateDelegate* ShellDelegateMus::CreateSessionStateDelegate() {
177 NOTIMPLEMENTED() << " Using a stub SessionStateDeleagte implementation"; 178 NOTIMPLEMENTED() << " Using a stub SessionStateDeleagte implementation";
178 return new SessionStateDelegateStub; 179 return new SessionStateDelegateStub;
179 } 180 }
180 181
181 AccessibilityDelegate* ShellDelegateMus::CreateAccessibilityDelegate() { 182 AccessibilityDelegate* ShellDelegateMus::CreateAccessibilityDelegate() {
182 NOTIMPLEMENTED() << " Using the default AccessibilityDelegate implementation"; 183 NOTIMPLEMENTED() << " Using the default AccessibilityDelegate implementation";
183 return new DefaultAccessibilityDelegate; 184 return new DefaultAccessibilityDelegate;
(...skipping 30 matching lines...) Expand all
214 return base::string16(); 215 return base::string16();
215 } 216 }
216 217
217 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { 218 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const {
218 NOTIMPLEMENTED(); 219 NOTIMPLEMENTED();
219 return gfx::Image(); 220 return gfx::Image();
220 } 221 }
221 222
222 } // namespace sysui 223 } // namespace sysui
223 } // namespace ash 224 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698