ash/accelerators/accelerator_interactive_uitest_chromeos.cc - Issue 2058173002: mash: Move SystemTrayDelegate ownership to WmShell

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/accelerators/accelerator_interactive_uitest_chromeos.cc

Issue 2058173002: mash: Move SystemTrayDelegate ownership to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: review feedback 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:

Index: ash/accelerators/accelerator_interactive_uitest_chromeos.cc

diff --git a/ash/accelerators/accelerator_interactive_uitest_chromeos.cc b/ash/accelerators/accelerator_interactive_uitest_chromeos.cc

index f354910bfcec9c7e48e37411ac57077e706cef76..cee9816af976762298f3f879496691f3f69c1cb7 100644

--- a/ash/accelerators/accelerator_interactive_uitest_chromeos.cc

+++ b/ash/accelerators/accelerator_interactive_uitest_chromeos.cc

@@ -169,7 +169,7 @@ TEST_F(AcceleratorInteractiveUITest, MAYBE_ChromeOsAccelerators) {

// Test VOLUME_MUTE, VOLUME_DOWN, and VOLUME_UP.

TestVolumeControlDelegate* volume_delegate = new TestVolumeControlDelegate;

- shell()->system_tray_delegate()->SetVolumeControlDelegate(

+ WmShell::Get()->system_tray_delegate()->SetVolumeControlDelegate(

std::unique_ptr<VolumeControlDelegate>(volume_delegate));

// VOLUME_MUTE.

EXPECT_EQ(0, volume_delegate->handle_volume_mute_count());