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

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

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

Powered by Google App Engine
This is Rietveld 408576698