ash/aura/wm_shell_aura.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/aura/wm_shell_aura.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:

Index: ash/aura/wm_shell_aura.cc

diff --git a/ash/aura/wm_shell_aura.cc b/ash/aura/wm_shell_aura.cc

index da3561549e76a6e2fc9c3c4105a7a29b95414597..4f686185256ae3bd1e53dd6652655a3241718bd9 100644

--- a/ash/aura/wm_shell_aura.cc

+++ b/ash/aura/wm_shell_aura.cc

@@ -8,16 +8,19 @@

#include "ash/aura/key_event_watcher_aura.h"

#include "ash/aura/pointer_watcher_adapter.h"

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

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

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

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

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

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

#include "ash/display/window_tree_host_manager.h"

#include "ash/host/ash_window_tree_host_init_params.h"

#include "ash/laser/laser_pointer_controller.h"

#include "ash/magnifier/partial_magnification_controller.h"

#include "ash/metrics/task_switch_metrics_recorder.h"

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

#include "ash/shared/immersive_fullscreen_controller.h"

#include "ash/shell.h"

-#include "ash/shell_delegate.h"

-#include "ash/shell_observer.h"

#include "ash/touch/touch_uma.h"

#include "ash/virtual_keyboard_controller.h"

#include "ash/wm/drag_window_resizer.h"

@@ -29,9 +32,6 @@

#include "ash/wm/window_cycle_event_filter_aura.h"

#include "ash/wm/window_util.h"

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

-#include "ash/wm_activation_observer.h"

-#include "ash/wm_display_observer.h"

-#include "ash/wm_window.h"

#include "base/memory/ptr_util.h"

#include "ui/aura/client/capture_client.h"

#include "ui/aura/client/focus_client.h"

« no previous file with comments | « ash/aura/wm_shell_aura.h ('k') | ash/autoclick/autoclick_controller.cc » ('j') | no next file with comments »