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

Unified Diff: chrome/browser/ui/ash/vpn_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/vpn_delegate_chromeos.cc
diff --git a/chrome/browser/ui/ash/vpn_delegate_chromeos.cc b/chrome/browser/ui/ash/vpn_delegate_chromeos.cc
index 08c8a25c7f889ab66a246d486fad8b5ca818574b..e34b8e1cd5960e271b441ce597cd2586ba0e6a03 100644
--- a/chrome/browser/ui/ash/vpn_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/vpn_delegate_chromeos.cc
@@ -5,7 +5,7 @@
#include "chrome/browser/ui/ash/vpn_delegate_chromeos.h"
#include "ash/common/system/tray/system_tray_delegate.h"
-#include "ash/shell.h"
+#include "ash/common/wm_shell.h"
#include "base/bind.h"
#include "base/location.h"
#include "base/logging.h"
@@ -80,7 +80,7 @@ const std::vector<ash::VPNProvider>& VPNDelegateChromeOS::GetVPNProviders()
void VPNDelegateChromeOS::ShowAddPage(const ash::VPNProvider::Key& key) {
if (!key.third_party) {
// Show the "add network" dialog for the built-in OpenVPN/L2TP provider.
- ash::Shell::GetInstance()->system_tray_delegate()->ShowOtherNetworkDialog(
+ ash::WmShell::Get()->system_tray_delegate()->ShowOtherNetworkDialog(
shill::kTypeVPN);
return;
}

Powered by Google App Engine
This is Rietveld 408576698