ash/shell.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/shell.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

Index: ash/shell.cc

diff --git a/ash/shell.cc b/ash/shell.cc

index 225017862119075632c283bc75c518958b61c5ac..2c6b0917bbe0f5d9b3d6515bcb8767b8372d4b43 100644

--- a/ash/shell.cc

+++ b/ash/shell.cc

@@ -25,6 +25,7 @@

#include "ash/common/shell_delegate.h"

#include "ash/common/shell_window_ids.h"

#include "ash/common/system/locale/locale_notification_controller.h"

+#include "ash/common/system/status_area_widget.h"

#include "ash/common/system/tray/system_tray_delegate.h"

#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"

#include "ash/common/wm/maximize_mode/maximize_mode_window_manager.h"

@@ -62,7 +63,6 @@

#include "ash/shelf/shelf_window_watcher.h"

#include "ash/shell_factory.h"

#include "ash/shell_init_params.h"

-#include "ash/system/status_area_widget.h"

#include "ash/system/toast/toast_manager.h"

#include "ash/utility/screenshot_controller.h"

#include "ash/wm/ash_focus_rules.h"

« ash/common/system/tray/system_tray_unittest.cc ('K') | « ash/shelf/shelf_layout_manager_unittest.cc ('k') | ash/shell/window_type_launcher.cc » ('j') | no next file with comments »