[Files.app] Use 'activate' event on the view-change menuitems instead of 'click' event

chrome/browser/resources/file_manager/foreground/js/file_manager.js

 // 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.
 
 'use strict';
 
 /**
  * FileManager constructor.
  *
  * FileManager objects encapsulate the functionality of the file selector
@@ skipping 791 matching lines @@
     this.syncButton = this.dialogDom_.querySelector('#drive-sync-settings');
     this.syncButton.addEventListener('click', this.onDrivePrefClick_.bind(
         this, 'cellularDisabled', false /* not inverted */));
 
     this.hostedButton = this.dialogDom_.querySelector('#drive-hosted-settings');
     this.hostedButton.addEventListener('click', this.onDrivePrefClick_.bind(
         this, 'hostedFilesDisabled', true /* inverted */));
 
     this.detailViewButton_ =
         this.dialogDom_.querySelector('#detail-view');
-    this.detailViewButton_.addEventListener('click',
+    this.detailViewButton_.addEventListener('activate',
         this.onDetailViewButtonClick_.bind(this));
 
     this.thumbnailViewButton_ =
         this.dialogDom_.querySelector('#thumbnail-view');
-    this.thumbnailViewButton_.addEventListener('click',
+    this.thumbnailViewButton_.addEventListener('activate',
         this.onThumbnailViewButtonClick_.bind(this));
 
     cr.ui.ComboButton.decorate(this.taskItems_);
     this.taskItems_.showMenu = function(shouldSetFocus) {
       // Prevent the empty menu from opening.
       if (!this.menu.length)
         return;
       cr.ui.ComboButton.prototype.showMenu.call(this, shouldSetFocus);
     };
     this.taskItems_.addEventListener('select',
@@ skipping 1950 matching lines @@
     };
 
     tryCreate();
   };
 
   /**
    * @param {Event} event Click event.
    * @private
    */
   FileManager.prototype.onDetailViewButtonClick_ = function(event) {
+    // Stop propagate and hide the menu manually, in order to prevent the focus
+    // from being back to the button. (cf. http://crbug.com/248479)
+    event.stopPropagation();
+    this.gearButton_.hideMenu();
+
     this.setListType(FileManager.ListType.DETAIL);
     this.currentList_.focus();
   };
 
   /**
    * @param {Event} event Click event.
    * @private
    */
   FileManager.prototype.onThumbnailViewButtonClick_ = function(event) {
+    // Stop propagate and hide the menu manually, in order to prevent the focus
+    // from being back to the button. (cf. http://crbug.com/248479)
+    event.stopPropagation();
+    this.gearButton_.hideMenu();
+
     this.setListType(FileManager.ListType.THUMBNAIL);
     this.currentList_.focus();
   };
 
   /**
    * KeyDown event handler for the document.
    * @param {Event} event Key event.
    * @private
    */
   FileManager.prototype.onKeyDown_ = function(event) {
@@ skipping 842 matching lines @@
       callback(this.preferences_);
       return;
     }
 
     chrome.fileBrowserPrivate.getPreferences(function(prefs) {
       this.preferences_ = prefs;
       callback(prefs);
     }.bind(this));
   };
 })();