chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc - Issue 2629643002: chromeos: Renames WmWindowAura to WmWindow

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 2629643002: chromeos: Renames WmWindowAura to WmWindow (Closed)

Patch Set: feedback Created 3 years, 11 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/launcher/multi_profile_browser_status_monitor.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 099b47f385b5813ed589840ebfc9eb2b7b82d25b..6a3d0007542b56cd11f89550597fdfa29ae8cc1a 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,13 +4,13 @@

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

-#include "ash/aura/wm_window_aura.h"

#include "ash/common/media_controller.h"

#include "ash/common/multi_profile_uma.h"

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

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

#include "ash/common/wm/window_state.h"

#include "ash/common/wm_shell.h"

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

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

#include "ash/root_window_controller.h"

#include "ash/shell.h"

@@ -743,7 +743,7 @@ void MultiUserWindowManagerChromeOS::SetWindowVisible(

// reduce animation jank from multiple resizes.

if (visible) {

ash::WmShell::Get()->maximize_mode_controller()->AddWindow(

- ash::WmWindowAura::Get(window));

+ ash::WmWindow::Get(window));

}

AnimationSetter animation_setter(