ash/root_window_controller.cc - Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3"

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/root_window_controller.cc

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (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/root_window_controller.cc

diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc

index c3387a10d33e2674370742cc87df0f48f494339a..a4ffb455e1b0d1a700533a4d24ecf8b01ca15eaa 100644

--- a/ash/root_window_controller.cc

+++ b/ash/root_window_controller.cc

@@ -8,33 +8,35 @@

#include <queue>

#include <vector>

-#include "ash/ash_constants.h"

-#include "ash/ash_switches.h"

#include "ash/ash_touch_exploration_manager_chromeos.h"

#include "ash/aura/aura_layout_manager_adapter.h"

-#include "ash/focus_cycler.h"

+#include "ash/common/ash_constants.h"

+#include "ash/common/ash_switches.h"

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

+#include "ash/common/login_status.h"

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

+#include "ash/common/shell_delegate.h"

+#include "ash/common/wallpaper/wallpaper_delegate.h"

+#include "ash/common/wallpaper/wallpaper_widget_controller.h"

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

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

#include "ash/high_contrast/high_contrast_controller.h"

#include "ash/host/ash_window_tree_host.h"

-#include "ash/login_status.h"

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

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

#include "ash/root_window_settings.h"

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

#include "ash/shelf/shelf_delegate.h"

#include "ash/shelf/shelf_layout_manager.h"

#include "ash/shelf/shelf_widget.h"

#include "ash/shelf/shelf_window_targeter.h"

#include "ash/shelf/wm_shelf.h"

#include "ash/shell.h"

-#include "ash/shell_delegate.h"

#include "ash/system/status_area_layout_manager.h"

#include "ash/system/status_area_widget.h"

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

#include "ash/touch/touch_hud_debug.h"

#include "ash/touch/touch_hud_projection.h"

#include "ash/touch/touch_observer_hud.h"

-#include "ash/wallpaper/wallpaper_delegate.h"

-#include "ash/wallpaper/wallpaper_widget_controller.h"

#include "ash/wm/always_on_top_controller.h"

#include "ash/wm/boot_splash_screen_chromeos.h"

#include "ash/wm/container_finder.h"

@@ -56,8 +58,6 @@

#include "ash/wm/wm_screen_util.h"

#include "ash/wm/workspace/workspace_layout_manager.h"

#include "ash/wm/workspace_controller.h"

-#include "ash/wm_shell.h"

-#include "ash/wm_window.h"

#include "base/command_line.h"

#include "base/macros.h"

#include "base/memory/ptr_util.h"

« no previous file with comments | « ash/root_window_controller.h ('k') | ash/root_window_controller_unittest.cc » ('j') | no next file with comments »