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

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

Issue 1760743002: Add simple mash context menu support. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove chrome delegation; address other comments. Created 4 years, 9 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 "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/context_menu_mus.h"
11 #include "ash/mus/shelf_delegate_mus.h" 12 #include "ash/mus/shelf_delegate_mus.h"
12 #include "ash/session/session_state_delegate.h" 13 #include "ash/session/session_state_delegate.h"
13 #include "ash/system/tray/default_system_tray_delegate.h" 14 #include "ash/system/tray/default_system_tray_delegate.h"
14 #include "base/strings/string16.h" 15 #include "base/strings/string16.h"
15 #include "components/user_manager/user_info_impl.h" 16 #include "components/user_manager/user_info_impl.h"
16 #include "ui/gfx/image/image.h" 17 #include "ui/gfx/image/image.h"
17 18
18 namespace ash { 19 namespace ash {
19 namespace sysui { 20 namespace sysui {
20 21
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 return MEDIA_CAPTURE_NONE; 89 return MEDIA_CAPTURE_NONE;
89 } 90 }
90 91
91 private: 92 private:
92 DISALLOW_COPY_AND_ASSIGN(MediaDelegateStub); 93 DISALLOW_COPY_AND_ASSIGN(MediaDelegateStub);
93 }; 94 };
94 95
95 } // namespace 96 } // namespace
96 97
97 ShellDelegateMus::ShellDelegateMus() {} 98 ShellDelegateMus::ShellDelegateMus() {}
99
98 ShellDelegateMus::~ShellDelegateMus() {} 100 ShellDelegateMus::~ShellDelegateMus() {}
99 101
100 bool ShellDelegateMus::IsFirstRunAfterBoot() const { 102 bool ShellDelegateMus::IsFirstRunAfterBoot() const {
101 NOTIMPLEMENTED(); 103 NOTIMPLEMENTED();
102 return false; 104 return false;
103 } 105 }
104 106
105 bool ShellDelegateMus::IsIncognitoAllowed() const { 107 bool ShellDelegateMus::IsIncognitoAllowed() const {
106 NOTIMPLEMENTED(); 108 NOTIMPLEMENTED();
107 return false; 109 return false;
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 return nullptr; 194 return nullptr;
193 } 195 }
194 196
195 MediaDelegate* ShellDelegateMus::CreateMediaDelegate() { 197 MediaDelegate* ShellDelegateMus::CreateMediaDelegate() {
196 NOTIMPLEMENTED() << " Using a stub MediaDelegate implementation"; 198 NOTIMPLEMENTED() << " Using a stub MediaDelegate implementation";
197 return new MediaDelegateStub; 199 return new MediaDelegateStub;
198 } 200 }
199 201
200 ui::MenuModel* ShellDelegateMus::CreateContextMenu(ash::Shelf* shelf, 202 ui::MenuModel* ShellDelegateMus::CreateContextMenu(ash::Shelf* shelf,
201 const ShelfItem* item) { 203 const ShelfItem* item) {
202 NOTIMPLEMENTED(); 204 return new ContextMenuMus(shelf);
203 return nullptr;
204 } 205 }
205 206
206 GPUSupport* ShellDelegateMus::CreateGPUSupport() { 207 GPUSupport* ShellDelegateMus::CreateGPUSupport() {
207 NOTIMPLEMENTED() << " Using a stub GPUSupport implementation"; 208 NOTIMPLEMENTED() << " Using a stub GPUSupport implementation";
208 return new GPUSupportStub(); 209 return new GPUSupportStub();
209 } 210 }
210 211
211 base::string16 ShellDelegateMus::GetProductName() const { 212 base::string16 ShellDelegateMus::GetProductName() const {
212 NOTIMPLEMENTED(); 213 NOTIMPLEMENTED();
213 return base::string16(); 214 return base::string16();
214 } 215 }
215 216
216 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { 217 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const {
217 NOTIMPLEMENTED(); 218 NOTIMPLEMENTED();
218 return gfx::Image(); 219 return gfx::Image();
219 } 220 }
220 221
221 } // namespace sysui 222 } // namespace sysui
222 } // namespace ash 223 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/context_menu_mus.cc ('k') | ash/shelf/shelf_view.h » ('j') | ash/shelf/shelf_view.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698