ash/common/wm_shell.cc - Issue 2408273002: mash: Port TrayUpdateTest to AshTest

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/common/wm_shell.cc

Issue 2408273002: mash: Port TrayUpdateTest to AshTest (Closed)

Patch Set: WmShellTestApi Created 4 years, 2 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/common/wm_shell.cc

diff --git a/ash/common/wm_shell.cc b/ash/common/wm_shell.cc

index af766176d38158707bc0e15ad1649ccceebd8d34..513f56622b172136c384826db9fbc0c94fbf5810 100644

--- a/ash/common/wm_shell.cc

+++ b/ash/common/wm_shell.cc

@@ -334,8 +334,6 @@ void WmShell::SetKeyboardUI(std::unique_ptr<KeyboardUI> keyboard_ui) {

void WmShell::SetSystemTrayDelegate(

std::unique_ptr<SystemTrayDelegate> delegate) {

DCHECK(delegate);

- DCHECK(!system_tray_delegate_);

- // TODO(jamescook): Create via ShellDelegate once it moves to //ash/common.

system_tray_delegate_ = std::move(delegate);

system_tray_delegate_->Initialize();

#if defined(OS_CHROMEOS)

« no previous file with comments | « ash/common/wm_shell.h ('k') | ash/mus/test/wm_test_helper.cc » ('j') | no next file with comments »