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

Unified Diff: ash/system/user/tray_user.cc

Issue 2808723004: Renames WmShell to ShellPort (Closed)
Patch Set: feedback Created 3 years, 8 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/system/user/tray_user.cc
diff --git a/ash/system/user/tray_user.cc b/ash/system/user/tray_user.cc
index a8d43c476af164cfc1ed540199fe602e9210f6b1..31561e88edfb9b5a7fe4942b37ff49717ebe564f 100644
--- a/ash/system/user/tray_user.cc
+++ b/ash/system/user/tray_user.cc
@@ -7,6 +7,7 @@
#include "ash/session/session_controller.h"
#include "ash/shelf/wm_shelf_util.h"
#include "ash/shell.h"
+#include "ash/shell_port.h"
#include "ash/strings/grit/ash_strings.h"
#include "ash/system/tray/system_tray.h"
#include "ash/system/tray/system_tray_delegate.h"
@@ -15,7 +16,6 @@
#include "ash/system/tray/tray_utils.h"
#include "ash/system/user/rounded_image_view.h"
#include "ash/system/user/user_view.h"
-#include "ash/wm_shell.h"
#include "base/logging.h"
#include "base/strings/string16.h"
#include "components/signin/core/account_id/account_id.h"
@@ -79,7 +79,7 @@ views::View* TrayUser::CreateDefaultView(LoginStatus status) {
// If the screen is locked or a system modal dialog box is shown, show only
// the currently active user.
if (user_index_ && (session_controller->IsUserSessionBlocked() ||
- WmShell::Get()->IsSystemModalWindowOpen()))
+ ShellPort::Get()->IsSystemModalWindowOpen()))
return nullptr;
CHECK(user_ == nullptr);

Powered by Google App Engine
This is Rietveld 408576698