Fix unable to delete extensions continuously through keyboard

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/trace_event/trace_event.h"
 #include "build/build_config.h"
@@ skipping 225 matching lines @@
 wm::CursorManager* DesktopNativeWidgetAura::cursor_manager_ = NULL;
 
 DesktopNativeWidgetAura::DesktopNativeWidgetAura(
     internal::NativeWidgetDelegate* delegate)
     : desktop_window_tree_host_(NULL),
       ownership_(Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET),
       content_window_container_(NULL),
       content_window_(new aura::Window(this)),
       native_widget_delegate_(delegate),
       last_drop_operation_(ui::DragDropTypes::DRAG_NONE),
+      restore_focus_on_activate_(false),
       cursor_(gfx::kNullCursor),
       widget_type_(Widget::InitParams::TYPE_WINDOW),
       close_widget_factory_(this) {
   aura::client::SetFocusChangeObserver(content_window_, this);
   aura::client::SetActivationChangeObserver(content_window_, this);
 }
 
 DesktopNativeWidgetAura::~DesktopNativeWidgetAura() {
   if (ownership_ == Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET)
     delete native_widget_delegate_;
@@ skipping 98 matching lines @@
     if (GetWidget()->HasFocusManager()) {
       // 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())
+      else if (view_for_activation == focus_manager->GetStoredFocusView()) {

[sky, 2016/11/21 22:21:40]

When you add parens to one branch of a conditional, add them too all (meaning
line 363 above).

         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
     // deactivated (child widgets don't get native desktop activation changes,
@@ skipping 705 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // DesktopNativeWidgetAura, aura::client::ActivationChangeObserver
 //    implementation:
 
 void DesktopNativeWidgetAura::OnWindowActivated(
     aura::client::ActivationChangeObserver::ActivationReason reason,
     aura::Window* gained_active,
     aura::Window* lost_active) {
   DCHECK(content_window_ == gained_active || content_window_ == lost_active);
-  if (lost_active == content_window_ && GetWidget()->HasFocusManager()) {
+  if (gained_active == content_window_ && restore_focus_on_activate_) {
+    restore_focus_on_activate_ = false;

[sky, 2016/11/21 16:19:08]

I'm still confused as to why we need logic here? Isn't HandleActivationChanged()
always called, so that the code to restore isn't needed?

[Qiang(Joe) Xu, 2016/11/21 19:25:10]

HandleActivationChanged is not always called. It is called only when there is a
desktop native widget activation or deactivation change. If there is a child
aura::Window activation/deactivation, but it doesn't trigger desktop native
level activation change, like the case in the bug link (verified by log), then
the restorefocusedview call here is needed.

So there are two cases:
(1) desktop widget is not active, child aura window gets activated. Under this
case, because of the new logic in FocusManager, it will trigger
|widget_|->Activate(). So skip the OnWindowActivated's RestoreFocusedView here
and rely on HandleActivationChange's RestoreFocusedView.
(2) desktop widget is active, child aura window get activated. In this case,
HandleActivationChange is not called. We then should rely on OnWindowActivated's
RestoreFocuseView.

For case one, set restore_focus_on_activate_ = false in HandleActivationChanged,
which grantees that if RestoreFocusedView becomes relying on desktop_native
widget activation, it will not depend on OnWindowActivated anymore.

+    // For OS_LINUX, desktop native widget may not be activated when child
+    // widgets gets aura activation changes. Only when desktop native widget is
+    // active, we can rely on aura activation to restore focused view.
+    if (GetWidget()->IsActive())
+      GetWidget()->GetFocusManager()->RestoreFocusedView();
+  } else if (lost_active == content_window_ && GetWidget()->HasFocusManager()) {
+    DCHECK(!restore_focus_on_activate_);
+    restore_focus_on_activate_ = true;
     // Pass in false so that ClearNativeFocus() isn't invoked.
     GetWidget()->GetFocusManager()->StoreFocusedView(false);
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DesktopNativeWidgetAura, aura::client::FocusChangeObserver implementation:
 
 void DesktopNativeWidgetAura::OnWindowFocused(aura::Window* gained_focus,
                                               aura::Window* lost_focus) {
@@ skipping 86 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