ash/mus/bridge/wm_shell_mus.cc - Issue 2734683002: chromeos: Move files in //ash/common to //ash, part 2

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/mus/bridge/wm_shell_mus.cc

Issue 2734683002: chromeos: Move files in //ash/common to //ash, part 2 (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/mus/bridge/wm_shell_mus.cc

diff --git a/ash/mus/bridge/wm_shell_mus.cc b/ash/mus/bridge/wm_shell_mus.cc

index a60bd2e6ff7b84d1ffdd7fcfe347ee2f4fb50995..2470cfc4c6cef09c06b7f6da303a09d0c37a4590 100644

--- a/ash/mus/bridge/wm_shell_mus.cc

+++ b/ash/mus/bridge/wm_shell_mus.cc

@@ -6,17 +6,12 @@

#include <utility>

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

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

#include "ash/common/key_event_watcher.h"

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

#include "ash/common/shell_delegate.h"

#include "ash/common/shell_observer.h"

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

-#include "ash/common/wm/maximize_mode/maximize_mode_event_handler.h"

-#include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h"

-#include "ash/common/wm/mru_window_tracker.h"

-#include "ash/common/wm/window_cycle_event_filter.h"

-#include "ash/common/wm/window_resizer.h"

#include "ash/common/wm_window.h"

#include "ash/mus/accelerators/accelerator_controller_delegate_mus.h"

#include "ash/mus/accelerators/accelerator_controller_registrar.h"

@@ -32,6 +27,11 @@

#include "ash/shell.h"

#include "ash/shell_init_params.h"

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

+#include "ash/wm/maximize_mode/maximize_mode_event_handler.h"

+#include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h"

+#include "ash/wm/mru_window_tracker.h"

+#include "ash/wm/window_cycle_event_filter.h"

+#include "ash/wm/window_resizer.h"

#include "ash/wm/window_util.h"

#include "base/memory/ptr_util.h"

#include "components/user_manager/user_info_impl.h"