ash/display/window_tree_host_manager.cc - Issue 2148593004: mash: Move StatusTray and StatusAreaWidget to //ash/common

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/display/window_tree_host_manager.cc

Issue 2148593004: mash: Move StatusTray and StatusAreaWidget to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@traydisplay

Patch Set: cleanup test Created 4 years, 5 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 side-by-side diff with in-line comments

Download patch

« ash/common/system/tray/system_tray_unittest.cc ('K') | « ash/common/system/web_notification/web_notification_tray.cc ('k') | ash/extended_desktop_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/display/window_tree_host_manager.cc

diff --git a/ash/display/window_tree_host_manager.cc b/ash/display/window_tree_host_manager.cc

index 233045a6886445fb34a060690e83134ee19603bc..79badc2652c2d94ab223ecff0b2e349916c1dbbb 100644

--- a/ash/display/window_tree_host_manager.cc

+++ b/ash/display/window_tree_host_manager.cc

@@ -11,6 +11,7 @@

#include <utility>

#include "ash/common/ash_switches.h"

+#include "ash/common/system/tray/system_tray.h"

#include "ash/display/cursor_window_controller.h"

#include "ash/display/display_layout_store.h"

#include "ash/display/display_manager.h"

@@ -26,7 +27,6 @@

#include "ash/root_window_settings.h"

#include "ash/screen_util.h"

#include "ash/shell.h"

-#include "ash/system/tray/system_tray.h"

#include "ash/wm/window_util.h"

#include "base/command_line.h"

#include "base/stl_util.h"