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

Unified Diff: chrome/browser/chromeos/profiles/avatar_menu_actions_chromeos.cc

Issue 2058173002: mash: Move SystemTrayDelegate ownership to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review feedback 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
Index: chrome/browser/chromeos/profiles/avatar_menu_actions_chromeos.cc
diff --git a/chrome/browser/chromeos/profiles/avatar_menu_actions_chromeos.cc b/chrome/browser/chromeos/profiles/avatar_menu_actions_chromeos.cc
index 7fb743e7215ecf9c59c3b0723d8fe7cc849c97c8..8526838e3a37995eebc040a1d952e5a15d838da7 100644
--- a/chrome/browser/chromeos/profiles/avatar_menu_actions_chromeos.cc
+++ b/chrome/browser/chromeos/profiles/avatar_menu_actions_chromeos.cc
@@ -5,8 +5,8 @@
#include "chrome/browser/chromeos/profiles/avatar_menu_actions_chromeos.h"
#include "ash/common/system/tray/system_tray_delegate.h"
+#include "ash/common/wm_shell.h"
#include "ash/multi_profile_uma.h"
-#include "ash/shell.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_avatar_icon_util.h"
#include "chrome/browser/ui/browser.h"
@@ -29,7 +29,7 @@ void AvatarMenuActionsChromeOS::AddNewProfile(ProfileMetrics::ProfileAdd type) {
// Let the user add another account to the session.
ash::MultiProfileUMA::RecordSigninUser(
ash::MultiProfileUMA::SIGNIN_USER_BY_BROWSER_FRAME);
- ash::Shell::GetInstance()->system_tray_delegate()->ShowUserLogin();
+ ash::WmShell::Get()->system_tray_delegate()->ShowUserLogin();
}
void AvatarMenuActionsChromeOS::EditProfile(Profile* profile) {

Powered by Google App Engine
This is Rietveld 408576698