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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/system/chromeos/network/tray_vpn.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
« ash/content/display/screen_orientation_controller_chromeos_unittest.cc ('K') | « ash/system/chromeos/network/network_state_list_detailed_view.cc ('k') | ash/system/chromeos/network/vpn_list_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/chromeos/network/tray_vpn.cc
diff --git a/ash/system/chromeos/network/tray_vpn.cc b/ash/system/chromeos/network/tray_vpn.cc
index 0a9f76790f451b44ea7e8b9951fe4f2120c46208..291c785db7aca99b56ddedb9bfd5a8ab38606062 100644
--- a/ash/system/chromeos/network/tray_vpn.cc
+++ b/ash/system/chromeos/network/tray_vpn.cc
@@ -7,6 +7,7 @@
#include "ash/common/session/session_state_delegate.h"
#include "ash/common/system/tray/system_tray_delegate.h"
#include "ash/common/system/tray/tray_constants.h"
+#include "ash/common/wm_shell.h"
#include "ash/metrics/user_metrics_recorder.h"
#include "ash/shell.h"
#include "ash/system/chromeos/network/network_state_list_detailed_view.h"
@@ -47,7 +48,7 @@ class VpnDefaultView : public TrayItemMore,
static bool ShouldShow() {
// Show the VPN entry in the ash tray bubble if at least one third-party VPN
// provider is installed.
- if (Shell::GetInstance()
+ if (WmShell::Get()
->system_tray_delegate()
->GetVPNDelegate()
->HaveThirdPartyVPNProviders()) {
« ash/content/display/screen_orientation_controller_chromeos_unittest.cc ('K') | « ash/system/chromeos/network/network_state_list_detailed_view.cc ('k') | ash/system/chromeos/network/vpn_list_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698