| Index: chrome/browser/chromeos/login/ui/webui_login_view.cc
|
| diff --git a/chrome/browser/chromeos/login/ui/webui_login_view.cc b/chrome/browser/chromeos/login/ui/webui_login_view.cc
|
| index 1c691514f8813ddc9dbf65c0a101f265405c35f4..57e135d2aa566dc754182dc2ed7001fe88081eee 100644
|
| --- a/chrome/browser/chromeos/login/ui/webui_login_view.cc
|
| +++ b/chrome/browser/chromeos/login/ui/webui_login_view.cc
|
| @@ -178,8 +178,7 @@ WebUILoginView::~WebUILoginView() {
|
| for (auto& observer : observer_list_)
|
| observer.OnHostDestroying();
|
|
|
| - if (!ash_util::IsRunningInMash() &&
|
| - ash::Shell::GetInstance()->HasPrimaryStatusArea()) {
|
| + if (!IsRunningInMash() && ash::Shell::GetInstance()->HasPrimaryStatusArea()) {
|
| ash::Shell::GetInstance()->GetPrimarySystemTray()->SetNextFocusableView(
|
| nullptr);
|
| } else {
|
| @@ -323,7 +322,7 @@ void WebUILoginView::LoadURL(const GURL& url) {
|
| web_view()->RequestFocus();
|
|
|
| // There is no Shell instance while running in mash.
|
| - if (ash_util::IsRunningInMash())
|
| + if (IsRunningInMash())
|
| return;
|
| }
|
|
|
| @@ -459,7 +458,7 @@ bool WebUILoginView::TakeFocus(content::WebContents* source, bool reverse) {
|
|
|
| // Focus is accepted, but the Ash system tray is not available in Mash, so
|
| // exit early.
|
| - if (ash_util::IsRunningInMash())
|
| + if (IsRunningInMash())
|
| return true;
|
|
|
| ash::SystemTray* tray = ash::Shell::GetInstance()->GetPrimarySystemTray();
|
|
|