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

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

Issue 1812013003: Pass shelf instances, not root windows, for ash context menus. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Call OnShelfAlignmentChanged after LayoutShelf. 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
« no previous file with comments | « ash/mus/shell_delegate_mus.h ('k') | ash/root_window_controller.cc » ('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"
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 NewWindowDelegate* ShellDelegateMus::CreateNewWindowDelegate() { 190 NewWindowDelegate* ShellDelegateMus::CreateNewWindowDelegate() {
191 NOTIMPLEMENTED(); 191 NOTIMPLEMENTED();
192 return nullptr; 192 return nullptr;
193 } 193 }
194 194
195 MediaDelegate* ShellDelegateMus::CreateMediaDelegate() { 195 MediaDelegate* ShellDelegateMus::CreateMediaDelegate() {
196 NOTIMPLEMENTED() << " Using a stub MediaDelegate implementation"; 196 NOTIMPLEMENTED() << " Using a stub MediaDelegate implementation";
197 return new MediaDelegateStub; 197 return new MediaDelegateStub;
198 } 198 }
199 199
200 ui::MenuModel* ShellDelegateMus::CreateContextMenu(aura::Window* root_window, 200 ui::MenuModel* ShellDelegateMus::CreateContextMenu(ash::Shelf* shelf,
201 const ShelfItem* item) { 201 const ShelfItem* item) {
202 NOTIMPLEMENTED(); 202 NOTIMPLEMENTED();
203 return nullptr; 203 return nullptr;
204 } 204 }
205 205
206 GPUSupport* ShellDelegateMus::CreateGPUSupport() { 206 GPUSupport* ShellDelegateMus::CreateGPUSupport() {
207 NOTIMPLEMENTED() << " Using a stub GPUSupport implementation"; 207 NOTIMPLEMENTED() << " Using a stub GPUSupport implementation";
208 return new GPUSupportStub(); 208 return new GPUSupportStub();
209 } 209 }
210 210
211 base::string16 ShellDelegateMus::GetProductName() const { 211 base::string16 ShellDelegateMus::GetProductName() const {
212 NOTIMPLEMENTED(); 212 NOTIMPLEMENTED();
213 return base::string16(); 213 return base::string16();
214 } 214 }
215 215
216 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { 216 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const {
217 NOTIMPLEMENTED(); 217 NOTIMPLEMENTED();
218 return gfx::Image(); 218 return gfx::Image();
219 } 219 }
220 220
221 } // namespace sysui 221 } // namespace sysui
222 } // namespace ash 222 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/shell_delegate_mus.h ('k') | ash/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698