ash/mus/bridge/wm_shell_mus.cc - Issue 2731873002: Revert "chromeos: Move files in //ash/common to //ash, part 1"

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 2731873002: Revert "chromeos: Move files in //ash/common to //ash, part 1" (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..87728714c6c3564f6c10ea0186c9a13acd5aefc1 100644

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

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

@@ -11,6 +11,7 @@

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

#include "ash/common/shell_delegate.h"

#include "ash/common/shell_observer.h"

+#include "ash/common/system/tray/system_tray_delegate.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"

@@ -31,7 +32,6 @@

#include "ash/shared/immersive_fullscreen_controller.h"

#include "ash/shell.h"

#include "ash/shell_init_params.h"

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

#include "ash/wm/window_util.h"

#include "base/memory/ptr_util.h"

#include "components/user_manager/user_info_impl.h"

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