ash/shelf/shelf_layout_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/shelf/shelf_layout_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

Index: ash/shelf/shelf_layout_manager.cc

diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc

index 435c04652dd1039f441fc50c436bad8bb3d7f62e..d89ffb22ce78178bb9a30a3f6e0ad4d961969b40 100644

--- a/ash/shelf/shelf_layout_manager.cc

+++ b/ash/shelf/shelf_layout_manager.cc

@@ -18,6 +18,7 @@

#include "ash/common/shelf/shelf_constants.h"

#include "ash/common/shelf/wm_shelf_util.h"

#include "ash/common/shell_window_ids.h"

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

#include "ash/common/wm/mru_window_tracker.h"

#include "ash/common/wm/window_state.h"

#include "ash/common/wm_root_window_controller.h"

@@ -32,7 +33,6 @@

#include "ash/shelf/shelf_util.h"

#include "ash/shelf/shelf_widget.h"

#include "ash/shell.h"

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

#include "ash/wm/gestures/shelf_gesture_handler.h"

#include "ash/wm/lock_state_controller.h"

#include "ash/wm/window_animations.h"

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