Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(721)

Unified Diff: chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc

Issue 2055053002: mash: Convert ash::ShellDelegate from aura::Window to WmWindow (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@movetrayupdate
Patch Set: rebase Created 4 years, 6 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/chrome_shell_delegate.cc ('k') | chrome/browser/ui/ash/session_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
index 2aa1db6cb3a6559b5d580658571f4b26cae8fb23..f6b6438516d9e9693a1c4ad53c60c629b03db62e 100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
+++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
@@ -106,9 +106,9 @@ class TestShellDelegateChromeOS : public ash::test::TestShellDelegate {
return new ash::test::TestSessionStateDelegate;
}
- bool CanShowWindowForUser(aura::Window* window) const override {
+ bool CanShowWindowForUser(ash::WmWindow* window) const override {
return ::CanShowWindowForUser(
- window,
+ ash::WmWindowAura::GetAuraWindow(window),
base::Bind(&ash::ShellContentState::GetActiveBrowserContext,
base::Unretained(ash::ShellContentState::GetInstance())));
}
« no previous file with comments | « chrome/browser/ui/ash/chrome_shell_delegate.cc ('k') | chrome/browser/ui/ash/session_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698