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

Side by Side Diff: ash/test/test_shell_delegate.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/test/test_shell_delegate.h ('k') | chrome/browser/ui/ash/chrome_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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/test/test_shell_delegate.h" 5 #include "ash/test/test_shell_delegate.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "ash/default_accessibility_delegate.h" 9 #include "ash/default_accessibility_delegate.h"
10 #include "ash/gpu_support_stub.h" 10 #include "ash/gpu_support_stub.h"
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 168
169 NewWindowDelegate* TestShellDelegate::CreateNewWindowDelegate() { 169 NewWindowDelegate* TestShellDelegate::CreateNewWindowDelegate() {
170 return new NewWindowDelegateImpl; 170 return new NewWindowDelegateImpl;
171 } 171 }
172 172
173 MediaDelegate* TestShellDelegate::CreateMediaDelegate() { 173 MediaDelegate* TestShellDelegate::CreateMediaDelegate() {
174 return new MediaDelegateImpl; 174 return new MediaDelegateImpl;
175 } 175 }
176 176
177 ui::MenuModel* TestShellDelegate::CreateContextMenu( 177 ui::MenuModel* TestShellDelegate::CreateContextMenu(
178 aura::Window* root_window, 178 ash::Shelf* shelf,
179 const ash::ShelfItem* item) { 179 const ash::ShelfItem* item) {
180 return nullptr; 180 return nullptr;
181 } 181 }
182 182
183 GPUSupport* TestShellDelegate::CreateGPUSupport() { 183 GPUSupport* TestShellDelegate::CreateGPUSupport() {
184 // Real GPU support depends on src/content, so just use a stub. 184 // Real GPU support depends on src/content, so just use a stub.
185 return new GPUSupportStub; 185 return new GPUSupportStub;
186 } 186 }
187 187
188 base::string16 TestShellDelegate::GetProductName() const { 188 base::string16 TestShellDelegate::GetProductName() const {
189 return base::string16(); 189 return base::string16();
190 } 190 }
191 191
192 gfx::Image TestShellDelegate::GetDeprecatedAcceleratorImage() const { 192 gfx::Image TestShellDelegate::GetDeprecatedAcceleratorImage() const {
193 return gfx::Image(); 193 return gfx::Image();
194 } 194 }
195 195
196 void TestShellDelegate::SetMediaCaptureState(MediaCaptureState state) { 196 void TestShellDelegate::SetMediaCaptureState(MediaCaptureState state) {
197 #if defined(OS_CHROMEOS) 197 #if defined(OS_CHROMEOS)
198 Shell* shell = Shell::GetInstance(); 198 Shell* shell = Shell::GetInstance();
199 static_cast<MediaDelegateImpl*>(shell->media_delegate()) 199 static_cast<MediaDelegateImpl*>(shell->media_delegate())
200 ->set_media_capture_state(state); 200 ->set_media_capture_state(state);
201 shell->system_tray_notifier()->NotifyMediaCaptureChanged(); 201 shell->system_tray_notifier()->NotifyMediaCaptureChanged();
202 #endif 202 #endif
203 } 203 }
204 204
205 } // namespace test 205 } // namespace test
206 } // namespace ash 206 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/test_shell_delegate.h ('k') | chrome/browser/ui/ash/chrome_shell_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698