Fix VK flashing after clicking action area on user pod

ui/login/account_picker/user_pod_row.js

 // Copyright 2014 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.
 
 /**
  * @fileoverview User pod row implementation.
  */
 
 cr.define('login', function() {
   /**
@@ skipping 2709 matching lines @@
      */
     isFocused: function(pod) {
       return this.focusedPod_ == pod;
     },
 
     /**
      * Focuses a given user pod or clear focus when given null.
      * @param {UserPod=} podToFocus User pod to focus (undefined clears focus).
      * @param {boolean=} opt_force If true, forces focus update even when
      *     podToFocus is already focused.
+     * @param {boolean=} opt_skip_input_focus If true, dont focus on the input

[dzhioev (left Google), 2015/07/17 18:48:50]

nit: s/dont/don't/

[bshe, 2015/07/17 21:34:58]

Done.

+     *     box of user pod.
      */
-    focusPod: function(podToFocus, opt_force) {
+    focusPod: function(podToFocus, opt_force, opt_skip_input_focus) {

[dzhioev (left Google), 2015/07/17 18:48:50]

nit: I'm not sure, but I think it should be called opt_skipInputFocus

[bshe, 2015/07/17 21:34:58]

Done.

       if (this.isFocused(podToFocus) && !opt_force) {
         // Calling focusPod w/o podToFocus means reset.
         if (!podToFocus)
           Oobe.clearErrors();
-        this.keyboardActivated_ = false;
         return;
       }
 
       // Make sure there's only one focusPod operation happening at a time.
       if (this.insideFocusPod_) {
-        this.keyboardActivated_ = false;
         return;
       }
       this.insideFocusPod_ = true;
 
       for (var i = 0, pod; pod = this.pods[i]; ++i) {
         if (!this.alwaysFocusSinglePod) {
           pod.isActionBoxMenuActive = false;
         }
         if (pod != podToFocus) {
           pod.isActionBoxMenuHovered = false;
@@ skipping 12 matching lines @@
       if (!this.isFocused(podToFocus))
         Oobe.clearErrors();
 
       var hadFocus = !!this.focusedPod_;
       this.focusedPod_ = podToFocus;
       if (podToFocus) {
         podToFocus.classList.remove('faded');
         podToFocus.classList.add('focused');
         if (!podToFocus.multiProfilesPolicyApplied) {
           podToFocus.classList.toggle('signing-in', false);
-          podToFocus.focusInput();
+          if (!opt_skip_input_focus)
+            podToFocus.focusInput();
         } else {
           podToFocus.userTypeBubbleElement.classList.add('bubble-shown');
+          // Note it is not necessary to skip this focus request when
+          // |opt_skip_input_focus| is true. When |multiProfilesPolicyApplied|
+          // is false, it doesn't focus on the password input box by default.
           podToFocus.focus();
         }
 
         // focusPod() automatically loads wallpaper
         if (!podToFocus.user.isApp)
           chrome.send('focusPod', [podToFocus.user.username]);
         this.firstShown_ = false;
         this.lastFocusedPod_ = podToFocus;
 
         if (Oobe.getInstance().virtualKeyboardShown)
           this.scrollFocusedPodIntoView();
       }
       this.insideFocusPod_ = false;
-      this.keyboardActivated_ = false;
     },
 
     /**
      * Resets wallpaper to the last active user's wallpaper, if any.
      */
     loadLastWallpaper: function() {
       if (this.lastFocusedPod_ && !this.lastFocusedPod_.user.isApp)
         chrome.send('loadWallpaper', [this.lastFocusedPod_.user.username]);
     },
 
@@ skipping 186 matching lines @@
           else
             e.target.userTypeBubbleElement.classList.add('bubble-shown');
         } else
           this.focusPod(e.target);
         return;
       }
 
       var pod = findAncestorByClass(e.target, 'pod');
       if (pod && pod.parentNode == this) {
         // Focus on a control of a pod but not on the action area button.
-        if (!pod.classList.contains('focused') &&
-            !e.target.classList.contains('action-box-button')) {
-          this.focusPod(pod);
+        if (!pod.classList.contains('focused')) {
+          if (e.target.classList.contains('action-box-area') ||
+              e.target.classList.contains('remove-warning-button')) {
+            // focusPod usually moves focus on the password input box which
+            // triggers virtual keyboard to show up. But the focus may move to a
+            // non text input element shortly by e.target.focus. Hence, a
+            // virtual keyboard flicking might be observed. We need to manually
+            // prevent focus on password input box to avoid virtual keyboard
+            // flicking in this case. See crbug.com/396016 for details.
+            this.focusPod(pod, false, true /* opt_skip_input_focus */);
+          } else {
+            this.focusPod(pod);
+          }
           pod.userTypeBubbleElement.classList.remove('bubble-shown');
           e.target.focus();
         }
         return;
       }
 
       // Clears pod focus when we reach here. It means new focus is neither
       // on a pod nor on a button/input for a pod.
       // Do not "defocus" user pod when it is a single pod.
       // That means that 'focused' class will not be removed and
@@ skipping 11 matching lines @@
      * Handler of keydown event.
      * @param {Event} e KeyDown Event object.
      */
     handleKeyDown: function(e) {
       if (this.disabled)
         return;
       var editing = e.target.tagName == 'INPUT' && e.target.value;
       switch (e.keyIdentifier) {
         case 'Left':
           if (!editing) {
-            this.keyboardActivated_ = true;
             if (this.focusedPod_ && this.focusedPod_.previousElementSibling)
               this.focusPod(this.focusedPod_.previousElementSibling);
             else
               this.focusPod(this.lastElementChild);
 
             e.stopPropagation();
           }
           break;
         case 'Right':
           if (!editing) {
-            this.keyboardActivated_ = true;
             if (this.focusedPod_ && this.focusedPod_.nextElementSibling)
               this.focusPod(this.focusedPod_.nextElementSibling);
             else
               this.focusPod(this.firstElementChild);
 
             e.stopPropagation();
           }
           break;
         case 'Enter':
           if (this.focusedPod_) {
@@ skipping 95 matching lines @@
        if (pod && pod.multiProfilesPolicyApplied) {
          pod.userTypeBubbleElement.classList.remove('bubble-shown');
        }
      }
   };
 
   return {
     PodRow: PodRow
   };
 });