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

Unified Diff: chrome/browser/ui/ash/chrome_shell_delegate.cc

Issue 2573703003: chromeos: Fix shelf appearing at login screen under mash (Closed)
Patch Set: rebase on session change, fix tests Created 4 years 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: chrome/browser/ui/ash/chrome_shell_delegate.cc
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc
index 2f1d12e8a0d13df9abd4f55fe091aab9a1190280..3dbe317b151378391f221023070d30f4480b27e9 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc
@@ -563,7 +563,6 @@ void ChromeShellDelegate::Observe(int type,
// chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED instead.
if (shelf_delegate_)
shelf_delegate_->OnUserProfileReadyToSwitch(profile);
- ash::Shell::GetInstance()->OnLoginUserProfilePrepared();
James Cook 2016/12/16 01:28:27 This is the core of the change. The shelf is creat
break;
}
case chrome::NOTIFICATION_SESSION_STARTED:
@@ -571,7 +570,6 @@ void ChromeShellDelegate::Observe(int type,
// start.
if (user_manager::UserManager::Get()->GetLoggedInUsers().size() < 2)
InitAfterFirstSessionStart();
- ash::WmShell::Get()->ShowShelf();
break;
default:
NOTREACHED() << "Unexpected notification " << type;

Powered by Google App Engine
This is Rietveld 408576698