ash/shelf/shelf_layout_manager_unittest.cc - Issue 2268823002: mash: Move more shelf files to ash/common/shelf.

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 2268823002: mash: Move more shelf files to ash/common/shelf. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix rebase. Created 4 years, 4 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/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 e74c9149015f2b786c07686efd5577e6ed2c7a6d..d3b7980341f84e3b53b72b89cc518d1f22c789ab 100644

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

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

@@ -2,7 +2,7 @@

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

// found in the LICENSE file.

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

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

#include "ash/aura/wm_window_aura.h"

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

@@ -10,8 +10,11 @@

#include "ash/common/focus_cycler.h"

#include "ash/common/material_design/material_design_controller.h"

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

+#include "ash/common/shelf/shelf.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/shell_window_ids.h"

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

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

@@ -20,9 +23,6 @@

#include "ash/common/wm_shell.h"

#include "ash/display/display_manager.h"

#include "ash/root_window_controller.h"

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

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

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

#include "ash/shell.h"

#include "ash/test/ash_test_base.h"

#include "ash/test/display_manager_test_api.h"

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