ash/mus/bridge/wm_shell_mus.cc - Issue 2430593002: mash: Use ash shell window container ids instead of ash::mojom::Container

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 2430593002: mash: Use ash shell window container ids instead of ash::mojom::Container (Closed)

Patch Set: rebase Created 4 years, 2 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 113524f84108a62080e75f07496e5c3fc36665e3..29658078b20db0983f7e1c35ecf5b7f5597ee169 100644

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

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

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

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

#include "ash/common/shell_delegate.h"

#include "ash/common/shell_observer.h"

-#include "ash/common/shell_window_ids.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"

@@ -26,11 +25,11 @@

#include "ash/mus/bridge/wm_root_window_controller_mus.h"

#include "ash/mus/bridge/wm_window_mus.h"

#include "ash/mus/bridge/workspace_event_handler_mus.h"

-#include "ash/mus/container_ids.h"

#include "ash/mus/drag_window_resizer.h"

#include "ash/mus/keyboard_ui_mus.h"

#include "ash/mus/root_window_controller.h"

#include "ash/mus/window_manager.h"

+#include "ash/public/cpp/shell_window_ids.h"

#include "ash/shared/immersive_fullscreen_controller.h"

#include "base/memory/ptr_util.h"

#include "components/user_manager/user_info_impl.h"

« no previous file with comments | « ash/mus/bridge/wm_root_window_controller_mus.cc ('k') | ash/mus/bridge/wm_window_mus.h » ('j') | no next file with comments »