ash/shelf/shelf_layout_manager_unittest.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_unittest.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_unittest.cc

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

index 47a0b375003de3461a3fc538004b0627216891fc..ff9aaaa5a883efdee5742f02a99f6e8669e91838 100644

--- a/ash/shelf/shelf_layout_manager_unittest.cc

+++ b/ash/shelf/shelf_layout_manager_unittest.cc

@@ -12,6 +12,8 @@

#include "ash/common/session/session_state_delegate.h"

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

#include "ash/common/shell_window_ids.h"

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

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

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

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

#include "ash/common/wm_shell.h"

@@ -24,8 +26,6 @@

#include "ash/shelf/shelf_view.h"

#include "ash/shelf/shelf_widget.h"

#include "ash/shell.h"

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

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

#include "ash/test/ash_test_base.h"

#include "ash/test/display_manager_test_api.h"

#include "ash/test/shelf_test_api.h"

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