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

Unified Diff: ash/common/system/chromeos/network/tray_vpn.cc

Issue 2761373002: Move yet more from WmShell to Shell (Closed)
Patch Set: merge Created 3 years, 9 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: ash/common/system/chromeos/network/tray_vpn.cc
diff --git a/ash/common/system/chromeos/network/tray_vpn.cc b/ash/common/system/chromeos/network/tray_vpn.cc
index 4827992cf255c659b1a6b965ae996074581eba74..38379debef143194083eb4cd88a05e824ba2e442 100644
--- a/ash/common/system/chromeos/network/tray_vpn.cc
+++ b/ash/common/system/chromeos/network/tray_vpn.cc
@@ -17,6 +17,7 @@
#include "ash/common/system/tray/tray_popup_item_style.h"
#include "ash/common/wm_shell.h"
#include "ash/resources/vector_icons/vector_icons.h"
+#include "ash/shell.h"
#include "ash/strings/grit/ash_strings.h"
#include "chromeos/network/network_state.h"
#include "chromeos/network/network_state_handler.h"
@@ -161,7 +162,7 @@ views::View* TrayVPN::CreateDefaultView(LoginStatus status) {
return NULL;
const bool is_in_secondary_login_screen =
- WmShell::Get()->session_controller()->IsInSecondaryLoginScreen();
+ Shell::Get()->session_controller()->IsInSecondaryLoginScreen();
default_ = new tray::VpnDefaultView(this);
default_->SetEnabled(status != LoginStatus::LOCKED &&

Powered by Google App Engine
This is Rietveld 408576698