ash/shelf/shelf_layout_manager_unittest.cc - Issue 2063813002: mash: Move SystemTrayImage and TrayImageItem 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 2063813002: mash: Move SystemTrayImage and TrayImageItem to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@wmnotifier

Patch Set: rebase Created 4 years, 6 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 88d2bbcfcca1b6f22f92dc547a1eab3e32513ced..da1a0238f5c96a668791c7b617b46b05e65df0d7 100644

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

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

@@ -9,6 +9,7 @@

#include "ash/ash_switches.h"

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

#include "ash/common/shell_window_ids.h"

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

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

#include "ash/display/display_manager.h"

#include "ash/display/window_tree_host_manager.h"

@@ -22,7 +23,6 @@

#include "ash/shell.h"

#include "ash/system/status_area_widget.h"

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

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

#include "ash/test/ash_test_base.h"

#include "ash/test/display_manager_test_api.h"

#include "ash/test/material_design_controller_test_api.h"

« ash/common/system/tray/DEPS ('K') | « ash/common/system/tray/tray_utils.cc ('k') | ash/system/audio/tray_audio.h » ('j') | no next file with comments »