chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.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: chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/ash/multi_user/multi_user_window_manager.cc ('k') | chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc

diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc

index d79d726d67ecc2bf618cd0b6be305ea05090156b..eae23e64b4793ddfca9b105216c5d826257b5372 100644

--- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc

+++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc

@@ -4,15 +4,15 @@

#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h"

-#include "ash/media_controller.h"

-#include "ash/multi_profile_uma.h"

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

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

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

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

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

#include "ash/shell.h"

#include "ash/wm/maximize_mode/maximize_mode_controller.h"

#include "ash/wm/window_state.h"

#include "ash/wm/window_state_aura.h"

-#include "ash/wm_shell.h"

-#include "ash/wm_window.h"

#include "base/auto_reset.h"

#include "base/macros.h"

#include "base/message_loop/message_loop.h"