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

Side by Side Diff: ash/mus/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/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"
11 #include "ash/common/palette_delegate.h" 11 #include "ash/common/palette_delegate.h"
12 #include "ash/common/session/session_state_delegate.h" 12 #include "ash/common/session/session_state_delegate.h"
13 #include "ash/common/system/tray/default_system_tray_delegate.h" 13 #include "ash/common/system/tray/default_system_tray_delegate.h"
14 #include "ash/common/wallpaper/wallpaper_delegate.h"
15 #include "ash/common/wm_shell.h" 14 #include "ash/common/wm_shell.h"
16 #include "ash/mus/accessibility_delegate_mus.h" 15 #include "ash/mus/accessibility_delegate_mus.h"
17 #include "ash/mus/context_menu_mus.h" 16 #include "ash/mus/context_menu_mus.h"
18 #include "ash/mus/new_window_delegate_mus.h" 17 #include "ash/mus/new_window_delegate_mus.h"
19 #include "ash/mus/shelf_delegate_mus.h" 18 #include "ash/mus/shelf_delegate_mus.h"
19 #include "ash/mus/wallpaper_delegate_mus.h"
20 #include "base/memory/ptr_util.h" 20 #include "base/memory/ptr_util.h"
21 #include "base/strings/string16.h" 21 #include "base/strings/string16.h"
22 #include "base/strings/string_util.h" 22 #include "base/strings/string_util.h"
23 #include "components/user_manager/user_info_impl.h" 23 #include "components/user_manager/user_info_impl.h"
24 #include "ui/app_list/presenter/app_list_presenter.h" 24 #include "ui/app_list/presenter/app_list_presenter.h"
25 #include "ui/gfx/image/image.h" 25 #include "ui/gfx/image/image.h"
26 26
27 namespace ash { 27 namespace ash {
28 namespace { 28 namespace {
29 29
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 ShelfDelegate* ShellDelegateMus::CreateShelfDelegate(ShelfModel* model) { 171 ShelfDelegate* ShellDelegateMus::CreateShelfDelegate(ShelfModel* model) {
172 return new ShelfDelegateMus(WmShell::Get()->shelf_model()); 172 return new ShelfDelegateMus(WmShell::Get()->shelf_model());
173 } 173 }
174 174
175 SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() { 175 SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() {
176 NOTIMPLEMENTED() << " Using the default SystemTrayDelegate implementation"; 176 NOTIMPLEMENTED() << " Using the default SystemTrayDelegate implementation";
177 return new DefaultSystemTrayDelegate; 177 return new DefaultSystemTrayDelegate;
178 } 178 }
179 179
180 std::unique_ptr<WallpaperDelegate> ShellDelegateMus::CreateWallpaperDelegate() { 180 std::unique_ptr<WallpaperDelegate> ShellDelegateMus::CreateWallpaperDelegate() {
181 NOTIMPLEMENTED(); 181 return base::MakeUnique<WallpaperDelegateMus>(connector_);
182 return nullptr;
183 } 182 }
184 183
185 SessionStateDelegate* ShellDelegateMus::CreateSessionStateDelegate() { 184 SessionStateDelegate* ShellDelegateMus::CreateSessionStateDelegate() {
186 NOTIMPLEMENTED() << " Using a stub SessionStateDeleagte implementation"; 185 NOTIMPLEMENTED() << " Using a stub SessionStateDeleagte implementation";
187 return new SessionStateDelegateStub; 186 return new SessionStateDelegateStub;
188 } 187 }
189 188
190 AccessibilityDelegate* ShellDelegateMus::CreateAccessibilityDelegate() { 189 AccessibilityDelegate* ShellDelegateMus::CreateAccessibilityDelegate() {
191 return new AccessibilityDelegateMus(connector_); 190 return new AccessibilityDelegateMus(connector_);
192 } 191 }
(...skipping 26 matching lines...) Expand all
219 NOTIMPLEMENTED(); 218 NOTIMPLEMENTED();
220 return base::string16(); 219 return base::string16();
221 } 220 }
222 221
223 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { 222 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const {
224 NOTIMPLEMENTED(); 223 NOTIMPLEMENTED();
225 return gfx::Image(); 224 return gfx::Image();
226 } 225 }
227 226
228 } // namespace ash 227 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698