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

Unified Diff: ash/system/user/tray_user_unittest.cc

Issue 2118593002: mash: Migrate ShellDelegate ownership and access to WmShell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments. Created 4 years, 5 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 | « ash/shell_unittest.cc ('k') | ash/system/user/user_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/user/tray_user_unittest.cc
diff --git a/ash/system/user/tray_user_unittest.cc b/ash/system/user/tray_user_unittest.cc
index 0cd7a085322d1b80f905d958ed5310c03d976af9..39adf622e474d1199ddf068c7109f2a18d74b330 100644
--- a/ash/system/user/tray_user_unittest.cc
+++ b/ash/system/user/tray_user_unittest.cc
@@ -4,11 +4,12 @@
#include <vector>
+#include "ash/common/shell_delegate.h"
#include "ash/common/system/tray/tray_constants.h"
#include "ash/common/system/user/tray_user_separator.h"
+#include "ash/common/wm_shell.h"
#include "ash/root_window_controller.h"
#include "ash/shell.h"
-#include "ash/shell_delegate.h"
#include "ash/system/tray/system_tray.h"
#include "ash/system/user/tray_user.h"
#include "ash/system/user/user_view.h"
@@ -78,7 +79,7 @@ void TrayUserTest::InitializeParameters(int users_logged_in,
// after everything was created.
delegate_->set_logged_in_users(users_logged_in);
test::TestShellDelegate* shell_delegate =
- static_cast<test::TestShellDelegate*>(Shell::GetInstance()->delegate());
+ static_cast<test::TestShellDelegate*>(WmShell::Get()->delegate());
shell_delegate->set_multi_profiles_enabled(multiprofile);
// Instead of using the existing tray panels we create new ones which makes
« no previous file with comments | « ash/shell_unittest.cc ('k') | ash/system/user/user_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698