Fix unable to delete extensions continuously through keyboard

ui/views/widget/desktop_aura/desktop_native_widget_aura.cc

Index: ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
index 671fcd17549476ce419c80c280205ed09c10ceed..cc4f0165bb4822280b93d120517e82d72bdfa4cc 100644
--- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
+++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
@@ -243,6 +243,7 @@ DesktopNativeWidgetAura::DesktopNativeWidgetAura(
       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) {
@@ -361,8 +362,13 @@ void DesktopNativeWidgetAura::HandleActivationChanged(bool active) {
                                       : 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
@@ -1088,7 +1094,16 @@ void DesktopNativeWidgetAura::OnWindowActivated(
     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);
   }