ash/shelf/shelf_layout_manager_unittest.cc - Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2

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 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (Closed)

Patch Set: Created 3 years, 9 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 ad2ee17b88ff639ce71d1e0327166307f2dcc875..8f4214d56e1770a5e82196dad9abd524103594fa 100644

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

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

@@ -2,22 +2,19 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#include "ash/common/shelf/shelf_layout_manager.h"

-#include "ash/common/accelerators/accelerator_controller.h"

-#include "ash/common/accelerators/accelerator_table.h"

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

-#include "ash/common/session/session_controller.h"

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

-#include "ash/common/shelf/shelf_layout_manager_observer.h"

-#include "ash/common/shelf/shelf_view.h"

-#include "ash/common/shelf/shelf_widget.h"

-#include "ash/common/shelf/wm_shelf.h"

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

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

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

+#include "ash/shelf/shelf_layout_manager.h"

+#include "ash/accelerators/accelerator_controller.h"

+#include "ash/accelerators/accelerator_table.h"

+#include "ash/focus_cycler.h"

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

#include "ash/root_window_controller.h"

+#include "ash/session/session_controller.h"

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

+#include "ash/shelf/shelf_layout_manager_observer.h"

+#include "ash/shelf/shelf_view.h"

+#include "ash/shelf/shelf_widget.h"

+#include "ash/shelf/wm_shelf.h"

#include "ash/shell.h"

#include "ash/system/status_area_widget.h"

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

@@ -26,8 +23,11 @@

#include "ash/test/test_app_list_view_presenter_impl.h"

#include "ash/test/test_system_tray_item.h"

#include "ash/wm/lock_state_controller.h"

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

#include "ash/wm/window_state_aura.h"

#include "ash/wm/window_util.h"

+#include "ash/wm_shell.h"

+#include "ash/wm_window.h"

#include "base/command_line.h"

#include "base/memory/ptr_util.h"

#include "base/run_loop.h"

« no previous file with comments | « ash/shelf/shelf_layout_manager_observer.h ('k') | ash/shelf/shelf_locking_manager.h » ('j') | no next file with comments »