ash/root_window_controller.cc - Issue 1926913002: Moves more code to ash/wm/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/root_window_controller.cc

Issue 1926913002: Moves more code to ash/wm/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@refactor_workspace_layout_manager

Patch Set: merge to trunk Created 4 years, 8 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 2a8bc785774d278293cfe83f90f83aba0a7c4c94..314d9cdba9c67ca6dd438e5712c70443c3e9e3d2 100644

--- a/ash/root_window_controller.cc

+++ b/ash/root_window_controller.cc

@@ -31,14 +31,15 @@

#include "ash/touch/touch_hud_debug.h"

#include "ash/touch/touch_hud_projection.h"

#include "ash/touch/touch_observer_hud.h"

-#include "ash/wm/always_on_top_controller.h"

#include "ash/wm/aura/aura_layout_manager_adapter.h"

#include "ash/wm/aura/wm_shelf_aura.h"

#include "ash/wm/aura/wm_window_aura.h"

+#include "ash/wm/common/always_on_top_controller.h"

#include "ash/wm/common/dock/docked_window_layout_manager.h"

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

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

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

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

#include "ash/wm/common/workspace/workspace_layout_manager_delegate.h"

#include "ash/wm/lock_layout_manager.h"

#include "ash/wm/panels/attached_panel_window_targeter.h"

@@ -52,7 +53,6 @@

#include "ash/wm/window_properties.h"

#include "ash/wm/window_state_aura.h"

#include "ash/wm/window_util.h"

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

#include "ash/wm/workspace_controller.h"

#include "base/command_line.h"

#include "base/memory/ptr_util.h"

« no previous file with comments | « ash/ash.gyp ('k') | ash/shell.cc » ('j') | no next file with comments »