ash/root_window_controller.cc - Issue 2025413002: Moves RootWindowControllerCommon and LayoutManager to 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 2025413002: Moves RootWindowControllerCommon and LayoutManager to common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@use_root_window_controller_common

Patch Set: merge Created 4 years, 7 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 f9281efba006f9b16e5ed6e721c925d17a0feb5f..a0f723ecb4f9a9f36d6109f5d34972e2c0e6d2b7 100644

--- a/ash/root_window_controller.cc

+++ b/ash/root_window_controller.cc

@@ -9,11 +9,14 @@

#include "ash/ash_constants.h"

#include "ash/ash_switches.h"

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

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

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

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

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

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

#include "ash/common/wm/panels/panel_layout_manager.h"

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

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

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

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

@@ -27,7 +30,6 @@

#include "ash/focus_cycler.h"

#include "ash/high_contrast/high_contrast_controller.h"

#include "ash/host/ash_window_tree_host.h"

-#include "ash/root_window_controller_common.h"

#include "ash/root_window_settings.h"

#include "ash/session/session_state_delegate.h"

#include "ash/shelf/shelf_layout_manager.h"

@@ -36,7 +38,6 @@

#include "ash/shell.h"

#include "ash/shell_delegate.h"

#include "ash/shell_factory.h"

-#include "ash/shell_window_ids.h"

#include "ash/system/status_area_widget.h"

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

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

@@ -49,7 +50,6 @@

#include "ash/wm/lock_layout_manager.h"

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

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

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

#include "ash/wm/stacking_controller.h"

#include "ash/wm/status_area_layout_manager.h"

#include "ash/wm/system_background_controller.h"

« no previous file with comments | « ash/metrics/user_metrics_recorder.cc ('k') | ash/root_window_controller_common.h » ('j') | no next file with comments »