Fix the mis-showing of the panel window during profile switch.

chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc

 // Copyright 2013 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 "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h"
 
 #include "ash/ash_switches.h"
 #include "ash/multi_profile_uma.h"
 #include "ash/root_window_controller.h"
 #include "ash/session/session_state_delegate.h"
@@ skipping 609 matching lines @@
     SetWindowVisibility(window, false, kTeleportAnimationTimeMS);
   }
 
   // Notify entry change.
   FOR_EACH_OBSERVER(Observer, observers_, OnOwnerEntryChanged(window));
   return true;
 }
 
 void MultiUserWindowManagerChromeOS::SetWindowVisibility(
     aura::Window* window, bool visible, int animation_time_in_ms) {
-  if (window->IsVisible() == visible)
+  // For a panel window, it's possible that this panel window is in the middle
+  // of relayout animation because of hiding/reshowing shelf during profile
+  // switch. Thus the window's visibility might not be its real visibility. See
+  // crbug.com/564725 for more info.
+  if (window->IsVisible() == visible && window->layer()->IsDrawn())

[oshima, 2016/02/11 23:31:56]

I dug a bit more and I think the following is the right one.

if (window->TargetVisibility() == visible)

or

if (window->layer()->GetTargetVisibility() == visible)

     return;
 
   // Hiding a system modal dialog should not be allowed. Instead we switch to
   // the user which is showing the system modal window.
   // Note that in some cases (e.g. unit test) windows might not have a root
   // window.
   if (!visible && window->GetRootWindow()) {
     // Get the system modal container for the window's root window.
     aura::Window* system_modal_container =
         window->GetRootWindow()->GetChildById(
@@ skipping 130 matching lines @@
     ash::Shell::GetInstance()->maximize_mode_controller()->AddWindow(window);
 
   AnimationSetter animation_setter(
       window,
       GetAdjustedAnimationTimeInMS(animation_time_in_ms));
 
   if (visible)
     window->Show();
   else
     window->Hide();
-
-  // Make sure that animations have no influence on the window state after the
-  // call.
-  DCHECK_EQ(visible, window->IsVisible());
 }
 
 int MultiUserWindowManagerChromeOS::GetAdjustedAnimationTimeInMS(
     int default_time_in_ms) const {
   return animation_speed_ == ANIMATION_SPEED_NORMAL ? default_time_in_ms :
       (animation_speed_ == ANIMATION_SPEED_FAST ? 10 : 0);
 }
 
 void MultiUserWindowManagerChromeOS::RemoveUser(const AccountId& account_id,
                                                 Profile* profile) {
   AccountIdToAppWindowObserver::iterator app_observer_iterator =
       account_id_to_app_observer_.find(account_id);
   DCHECK(app_observer_iterator != account_id_to_app_observer_.end())
       << "User id '" << account_id.GetUserEmail() << "', profile=" << profile
       << " was not found.";
   if (app_observer_iterator == account_id_to_app_observer_.end())
     return;
 
   extensions::AppWindowRegistry::Get(profile)
       ->RemoveObserver(app_observer_iterator->second);
   delete app_observer_iterator->second;
   account_id_to_app_observer_.erase(app_observer_iterator);
 }
 
 }  // namespace chrome