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

Unified Diff: chrome/browser/ui/ash/network_connect_delegate_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/ui/ash/network_connect_delegate_chromeos.cc
diff --git a/chrome/browser/ui/ash/network_connect_delegate_chromeos.cc b/chrome/browser/ui/ash/network_connect_delegate_chromeos.cc
index f103dd27ada55c3c3d8a13cfd850f80b9c569818..ea8581b2e5597081c7782120ad72c747a2bfdfdb 100644
--- a/chrome/browser/ui/ash/network_connect_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/network_connect_delegate_chromeos.cc
@@ -7,6 +7,7 @@
#include "ash/common/session/session_state_delegate.h"
#include "ash/common/shell_window_ids.h"
#include "ash/common/system/tray/system_tray_delegate.h"
+#include "ash/common/wm_shell.h"
#include "ash/shell.h"
#include "ash/system/user/login_status.h"
#include "chrome/browser/chromeos/enrollment_dialog_view.h"
@@ -26,7 +27,7 @@ gfx::NativeWindow GetNativeWindow() {
->session_state_delegate()
->IsActiveUserSessionStarted();
ash::LoginStatus login_status =
- ash::Shell::GetInstance()->system_tray_delegate()->GetUserLoginStatus();
+ ash::WmShell::Get()->system_tray_delegate()->GetUserLoginStatus();
bool isUserAddingRunning = ash::Shell::GetInstance()
->session_state_delegate()
->IsInSecondaryLoginScreen();
@@ -61,7 +62,7 @@ void NetworkConnectDelegateChromeOS::ShowNetworkSettingsForGuid(
const std::string& network_id) {
if (!IsUIAvailable())
return;
- ash::Shell::GetInstance()->system_tray_delegate()->ShowNetworkSettingsForGuid(
+ ash::WmShell::Get()->system_tray_delegate()->ShowNetworkSettingsForGuid(
network_id);
}

Powered by Google App Engine
This is Rietveld 408576698