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

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

Issue 2086143002: Convert TrayEventFilter to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tweak Created 4 years, 6 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
« no previous file with comments | « ash/sysui/shell_delegate_mus.h ('k') | ash/test/test_shell_delegate.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/session/session_state_delegate.h" 8 #include "ash/common/session/session_state_delegate.h"
9 #include "ash/common/system/tray/default_system_tray_delegate.h" 9 #include "ash/common/system/tray/default_system_tray_delegate.h"
10 #include "ash/gpu_support_stub.h" 10 #include "ash/gpu_support_stub.h"
11 #include "ash/media_delegate.h" 11 #include "ash/media_delegate.h"
12 #include "ash/sysui/app_list_presenter_mus.h" 12 #include "ash/sysui/app_list_presenter_mus.h"
13 #include "ash/sysui/container_delegate_mus.h"
14 #include "ash/sysui/context_menu_mus.h" 13 #include "ash/sysui/context_menu_mus.h"
15 #include "ash/sysui/pointer_watcher_delegate_mus.h" 14 #include "ash/sysui/pointer_watcher_delegate_mus.h"
16 #include "ash/sysui/shelf_delegate_mus.h" 15 #include "ash/sysui/shelf_delegate_mus.h"
17 #include "ash/sysui/user_wallpaper_delegate_mus.h" 16 #include "ash/sysui/user_wallpaper_delegate_mus.h"
18 #include "base/memory/ptr_util.h" 17 #include "base/memory/ptr_util.h"
19 #include "base/strings/string16.h" 18 #include "base/strings/string16.h"
20 #include "components/user_manager/user_info_impl.h" 19 #include "components/user_manager/user_info_impl.h"
21 #include "ui/app_list/presenter/app_list_presenter.h" 20 #include "ui/app_list/presenter/app_list_presenter.h"
22 #include "ui/gfx/image/image.h" 21 #include "ui/gfx/image/image.h"
23 22
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 NewWindowDelegate* ShellDelegateMus::CreateNewWindowDelegate() { 202 NewWindowDelegate* ShellDelegateMus::CreateNewWindowDelegate() {
204 NOTIMPLEMENTED(); 203 NOTIMPLEMENTED();
205 return nullptr; 204 return nullptr;
206 } 205 }
207 206
208 MediaDelegate* ShellDelegateMus::CreateMediaDelegate() { 207 MediaDelegate* ShellDelegateMus::CreateMediaDelegate() {
209 NOTIMPLEMENTED() << " Using a stub MediaDelegate implementation"; 208 NOTIMPLEMENTED() << " Using a stub MediaDelegate implementation";
210 return new MediaDelegateStub; 209 return new MediaDelegateStub;
211 } 210 }
212 211
213 std::unique_ptr<ContainerDelegate> ShellDelegateMus::CreateContainerDelegate() {
214 return base::WrapUnique(new ContainerDelegateMus);
215 }
216
217 std::unique_ptr<PointerWatcherDelegate> 212 std::unique_ptr<PointerWatcherDelegate>
218 ShellDelegateMus::CreatePointerWatcherDelegate() { 213 ShellDelegateMus::CreatePointerWatcherDelegate() {
219 return base::WrapUnique(new PointerWatcherDelegateMus); 214 return base::WrapUnique(new PointerWatcherDelegateMus);
220 } 215 }
221 216
222 ui::MenuModel* ShellDelegateMus::CreateContextMenu(WmShelf* wm_shelf, 217 ui::MenuModel* ShellDelegateMus::CreateContextMenu(WmShelf* wm_shelf,
223 const ShelfItem* item) { 218 const ShelfItem* item) {
224 return new ContextMenuMus(wm_shelf); 219 return new ContextMenuMus(wm_shelf);
225 } 220 }
226 221
227 GPUSupport* ShellDelegateMus::CreateGPUSupport() { 222 GPUSupport* ShellDelegateMus::CreateGPUSupport() {
228 NOTIMPLEMENTED() << " Using a stub GPUSupport implementation"; 223 NOTIMPLEMENTED() << " Using a stub GPUSupport implementation";
229 return new GPUSupportStub(); 224 return new GPUSupportStub();
230 } 225 }
231 226
232 base::string16 ShellDelegateMus::GetProductName() const { 227 base::string16 ShellDelegateMus::GetProductName() const {
233 NOTIMPLEMENTED(); 228 NOTIMPLEMENTED();
234 return base::string16(); 229 return base::string16();
235 } 230 }
236 231
237 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { 232 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const {
238 NOTIMPLEMENTED(); 233 NOTIMPLEMENTED();
239 return gfx::Image(); 234 return gfx::Image();
240 } 235 }
241 236
242 } // namespace sysui 237 } // namespace sysui
243 } // namespace ash 238 } // namespace ash
OLDNEW
« no previous file with comments | « ash/sysui/shell_delegate_mus.h ('k') | ash/test/test_shell_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698