| 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);
|
|
|