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

Side by Side Diff: ash/test/test_shell_delegate.cc

Issue 2046843005: mash: Migrate shelf menus to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ash_shell_with_content 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/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/app_list/app_list_presenter_delegate.h" 9 #include "ash/app_list/app_list_presenter_delegate.h"
10 #include "ash/app_list/app_list_presenter_delegate_factory.h" 10 #include "ash/app_list/app_list_presenter_delegate_factory.h"
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 std::unique_ptr<ash::ContainerDelegate> 209 std::unique_ptr<ash::ContainerDelegate>
210 TestShellDelegate::CreateContainerDelegate() { 210 TestShellDelegate::CreateContainerDelegate() {
211 return base::WrapUnique(new ContainerDelegateAura); 211 return base::WrapUnique(new ContainerDelegateAura);
212 } 212 }
213 213
214 std::unique_ptr<PointerWatcherDelegate> 214 std::unique_ptr<PointerWatcherDelegate>
215 TestShellDelegate::CreatePointerWatcherDelegate() { 215 TestShellDelegate::CreatePointerWatcherDelegate() {
216 return base::WrapUnique(new PointerWatcherDelegateAura); 216 return base::WrapUnique(new PointerWatcherDelegateAura);
217 } 217 }
218 218
219 ui::MenuModel* TestShellDelegate::CreateContextMenu( 219 ui::MenuModel* TestShellDelegate::CreateContextMenu(WmShelf* wm_shelf,
220 ash::Shelf* shelf, 220 const ShelfItem* item) {
221 const ash::ShelfItem* item) {
222 return nullptr; 221 return nullptr;
223 } 222 }
224 223
225 GPUSupport* TestShellDelegate::CreateGPUSupport() { 224 GPUSupport* TestShellDelegate::CreateGPUSupport() {
226 // Real GPU support depends on src/content, so just use a stub. 225 // Real GPU support depends on src/content, so just use a stub.
227 return new GPUSupportStub; 226 return new GPUSupportStub;
228 } 227 }
229 228
230 base::string16 TestShellDelegate::GetProductName() const { 229 base::string16 TestShellDelegate::GetProductName() const {
231 return base::string16(); 230 return base::string16();
232 } 231 }
233 232
234 gfx::Image TestShellDelegate::GetDeprecatedAcceleratorImage() const { 233 gfx::Image TestShellDelegate::GetDeprecatedAcceleratorImage() const {
235 return gfx::Image(); 234 return gfx::Image();
236 } 235 }
237 236
238 void TestShellDelegate::SetMediaCaptureState(MediaCaptureState state) { 237 void TestShellDelegate::SetMediaCaptureState(MediaCaptureState state) {
239 #if defined(OS_CHROMEOS) 238 #if defined(OS_CHROMEOS)
240 Shell* shell = Shell::GetInstance(); 239 Shell* shell = Shell::GetInstance();
241 static_cast<MediaDelegateImpl*>(shell->media_delegate()) 240 static_cast<MediaDelegateImpl*>(shell->media_delegate())
242 ->set_media_capture_state(state); 241 ->set_media_capture_state(state);
243 shell->system_tray_notifier()->NotifyMediaCaptureChanged(); 242 shell->system_tray_notifier()->NotifyMediaCaptureChanged();
244 #endif 243 #endif
245 } 244 }
246 245
247 } // namespace test 246 } // namespace test
248 } // namespace ash 247 } // 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