ash: Merge LoginStatus update code path

ash/shell.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/shell.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 
@@ skipping 310 matching lines @@
     views::Widget* widget) {
   // Use translucent-style window frames for dialogs.
   return new CustomFrameViewAsh(widget);
 }
 
 void Shell::SetDisplayWorkAreaInsets(Window* contains,
                                      const gfx::Insets& insets) {
   wm_shell_->SetDisplayWorkAreaInsets(WmWindow::Get(contains), insets);
 }
 
-void Shell::OnLoginStateChanged(LoginStatus status) {
-  for (auto& observer : shell_observers_)
-    observer.OnLoginStateChanged(status);
-}
-
 void Shell::OnAppTerminating() {
   for (auto& observer : shell_observers_)
     observer.OnAppTerminating();
 }
 
 void Shell::OnLockStateChanged(bool locked) {
   for (auto& observer : shell_observers_)
     observer.OnLockStateChanged(locked);
 #ifndef NDEBUG
   // Make sure that there is no system modal in Lock layer when unlocked.
@@ skipping 888 matching lines @@
   // Create the shelf when a session becomes active. It's safe to do this
   // multiple times (e.g. initial login vs. multiprofile add session).
   if (state == session_manager::SessionState::ACTIVE) {
     CreateShelfView();
 
     if (!wm_shell_->IsRunningInMash()) {
       // Recreate the keyboard after initial login and after multiprofile login.
       CreateKeyboard();
     }
   }
+}
 
-  // Only trigger an update in mash because with classic ash chrome calls
-  // UpdateAfterLoginStatusChange() directly.
-  if (wm_shell_->IsRunningInMash()) {
-    // TODO(jamescook): Should this call Shell::OnLoginStatusChanged() too?
-    UpdateAfterLoginStatusChange(session_controller_->GetLoginStatus());
-  }
+void Shell::LoginStatusChanged(LoginStatus login_status) {
+  UpdateAfterLoginStatusChange(login_status);
+
+  // TODO(xiyuan): Update OnLoginStateChanged -> OnLoginStatusChanged.
+  for (auto& observer : shell_observers_)
+    observer.OnLoginStateChanged(login_status);
 }
 
 void Shell::OnPrefServiceInitialized(
     std::unique_ptr<::PrefService> pref_service) {
   if (!instance_)
     return;
   DCHECK(pref_service);
   pref_service_ = std::move(pref_service);
 }
 
 }  // namespace ash