desktop_aura: do not restore focused view if it has modal transient child

ui/views/widget/desktop_aura/desktop_native_widget_aura.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 "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/trace_event/trace_event.h"
@@ skipping 38 matching lines @@
 #include "ui/views/widget/window_reorderer.h"
 #include "ui/wm/core/compound_event_filter.h"
 #include "ui/wm/core/cursor_manager.h"
 #include "ui/wm/core/focus_controller.h"
 #include "ui/wm/core/native_cursor_manager.h"
 #include "ui/wm/core/shadow_controller.h"
 #include "ui/wm/core/shadow_types.h"
 #include "ui/wm/core/visibility_controller.h"
 #include "ui/wm/core/window_animations.h"
 #include "ui/wm/core/window_modality_controller.h"
+#include "ui/wm/core/window_util.h"
 #include "ui/wm/public/activation_client.h"
 
 #if defined(OS_WIN)
 #include "ui/base/win/shell.h"
 #endif
 
 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(VIEWS_EXPORT,
                                       views::DesktopNativeWidgetAura*);
 
 namespace views {
 
 DEFINE_UI_CLASS_PROPERTY_KEY(DesktopNativeWidgetAura*,
                            kDesktopNativeWidgetAuraKey, NULL);
 
 namespace {
 
+// Returns true if |widget| has modal transient child, otherwise false.
+bool HasModalTransientChild(const Widget* widget) {
+  DCHECK(widget);
+  for (auto* window : ::wm::GetTransientChildren(widget->GetNativeView())) {
+    ui::ModalType type = Widget::GetWidgetForNativeView(window)

[sky, 2017/06/02 17:34:10]

Are you sure you don't want GetModalTransient(widget->GetNativeView()) ?

[Qiang(Joe) Xu, 2017/06/02 21:37:08]

I should use this. Thanks!

+                             ->widget_delegate()
+                             ->GetModalType();
+    if (type == ui::MODAL_TYPE_SYSTEM || type == ui::MODAL_TYPE_WINDOW)
+      return true;
+  }
+  return false;
+}
+
 // This class provides functionality to create a top level widget to host a
 // child window.
 class DesktopNativeWidgetTopLevelHandler : public aura::WindowObserver {
  public:
   // This function creates a widget with the bounds passed in which eventually
   // becomes the parent of the child window passed in.
   static aura::Window* CreateParentWindow(aura::Window* child_window,
                                           const gfx::Rect& bounds,
                                           bool full_screen,
                                           bool root_is_always_on_top) {
@@ skipping 272 matching lines @@
       // This function can be called before the focus manager has had a
       // chance to set the focused view. In which case we should get the
       // last focused view.
       views::FocusManager* focus_manager = GetWidget()->GetFocusManager();
       View* view_for_activation = focus_manager->GetFocusedView()
                                       ? focus_manager->GetFocusedView()
                                       : focus_manager->GetStoredFocusView();
       if (!view_for_activation) {
         view_for_activation = GetWidget()->GetRootView();
       } else if (view_for_activation == focus_manager->GetStoredFocusView()) {
-        focus_manager->RestoreFocusedView();
-        // Set to false if desktop native widget has activated activation
-        // change, so that aura window activation change focus restore operation
-        // can be ignored.
-        restore_focus_on_activate_ = false;
+        // The desktop native widget may have modal transient child, whose focus

[sky, 2017/06/02 17:34:10]

This just documents the code, the interesting part is the why. Why don't we
restore focus in this case?

[Qiang(Joe) Xu, 2017/06/02 21:37:08]

Done.

+        // is not managed by |focus_manager|. We shall restore focus to modal
+        // window only in this case (crbug.com/727641).
+        if (!HasModalTransientChild(GetWidget())) {
+          focus_manager->RestoreFocusedView();
+          // Set to false if desktop native widget has activated activation
+          // change, so that aura window activation change focus restore
+          // operation can be ignored.
+          restore_focus_on_activate_ = false;
+        }
       }
       activation_client->ActivateWindow(
           view_for_activation->GetWidget()->GetNativeView());
       // Refreshes the focus info to IMF in case that IMF cached the old info
       // about focused text input client when it was "inactive".
       GetInputMethod()->OnFocus();
     }
   } else {
     // If we're not active we need to deactivate the corresponding
     // aura::Window. This way if a child widget is active it gets correctly
@@ skipping 823 matching lines @@
   if (cursor_reference_count_ == 0) {
     // We are the last DesktopNativeWidgetAura instance, and we are responsible
     // for cleaning up |cursor_manager_|.
     delete cursor_manager_;
     native_cursor_manager_ = NULL;
     cursor_manager_ = NULL;
   }
 }
 
 }  // namespace views