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

Unified Diff: ash/common/system/tray/tray_popup_utils.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
« no previous file with comments | « ash/common/system/tray/system_tray.cc ('k') | ash/common/system/user/login_status.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/tray/tray_popup_utils.cc
diff --git a/ash/common/system/tray/tray_popup_utils.cc b/ash/common/system/tray/tray_popup_utils.cc
index d1227bec2c3d434b4b18b5ece5836d164a8ae814..98e9fdba649ad5ffd1d780d4afe582444fc3a423 100644
--- a/ash/common/system/tray/tray_popup_utils.cc
+++ b/ash/common/system/tray/tray_popup_utils.cc
@@ -14,8 +14,8 @@
#include "ash/common/system/tray/size_range_layout.h"
#include "ash/common/system/tray/tray_constants.h"
#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 "base/memory/ptr_util.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/gfx/paint_vector_icon.h"
@@ -431,7 +431,7 @@ bool TrayPopupUtils::CanOpenWebUISettings(LoginStatus status) {
// ShowSettings() method.
return status != LoginStatus::NOT_LOGGED_IN &&
status != LoginStatus::LOCKED &&
- !WmShell::Get()->session_controller()->IsInSecondaryLoginScreen();
+ !Shell::Get()->session_controller()->IsInSecondaryLoginScreen();
}
} // namespace ash
« no previous file with comments | « ash/common/system/tray/system_tray.cc ('k') | ash/common/system/user/login_status.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698