ash/common/system/tray/system_tray_unittest.cc - Issue 2620153003: Folds WmRootWindowController into RootWindowController

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/common/system/tray/system_tray_unittest.cc

Issue 2620153003: Folds WmRootWindowController into RootWindowController (Closed)

Patch Set: merge Created 3 years, 11 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:

Index: ash/common/system/tray/system_tray_unittest.cc

diff --git a/ash/common/system/tray/system_tray_unittest.cc b/ash/common/system/tray/system_tray_unittest.cc

index 332d9b9b459638c3da6c647155ae4e00cbfc28fc..edfb2c64af293f2a3b8ed15b285b9aab9026e5a5 100644

--- a/ash/common/system/tray/system_tray_unittest.cc

+++ b/ash/common/system/tray/system_tray_unittest.cc

@@ -17,10 +17,10 @@

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

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

#include "ash/common/system/web_notification/web_notification_tray.h"

-#include "ash/common/wm_root_window_controller.h"

#include "ash/common/wm_shell.h"

#include "ash/common/wm_window.h"

#include "ash/public/cpp/shell_window_ids.h"

+#include "ash/root_window_controller.h"

#include "ash/test/ash_test_base.h"

#include "ash/test/status_area_widget_test_helper.h"

#include "ash/test/test_system_tray_item.h"