[FileBrowser] Migrated ComboButton to menu as dropdown.

chrome/browser/resources/file_manager/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.
 
 /**
  * FileManager constructor.
  *
  * FileManager objects encapsulate the functionality of the file selector
  * dialogs, as well as the full screen file manager application (though the
  * latter is not yet implemented).
@@ skipping 2395 matching lines @@
     return path &&
         this.isGDataEnabled() &&
         DirectoryModel.getRootType(path) == DirectoryModel.RootType.GDATA;
   };
 
   FileManager.prototype.getMetadataProvider = function() {
     return this.metadataProvider_;
   };
 
   /**
+   * Creates combobox item based on task.
+   * @param {Object} task Task to convert.
+   * @return {Object} Item appendable to combobox drop-down list.
+   */
+  FileManager.prototype.createComboboxItem_ = function(task) {
+    return { label: task.title, iconUrl: task.iconUrl, task: task};

[dgozman, 2012/05/21 12:40:38]

space before }

[Dmitry Zvorygin, 2012/05/21 13:20:14]

Done.

+  }
+
+  /**
    * Callback called when tasks for selected files are determined.
    * @param {Object} selection Selection is passed here, since this.selection
    *     can change before tasks were found, and we should be accurate.
    * @param {Array.<Task>} tasksList The tasks list.
    */
   FileManager.prototype.onTasksFound_ = function(selection, tasksList) {
     this.taskItems_.clear();
 
     var defaultTask = null;
     var tasksCount = 0;
+
     for (var i = 0; i < tasksList.length; i++) {
       var task = tasksList[i];
 
       // Tweak images, titles of internal tasks.
       var task_parts = task.taskId.split('|');
       if (task_parts[0] == this.getExtensionId_()) {
         if (task_parts[1] == 'play') {
           // TODO(serya): This hack needed until task.iconUrl is working
           //             (see GetFileTasksFileBrowserFunction::RunImpl).
           task.iconUrl =
@@ skipping 38 matching lines @@
         } else if (task_parts[1] == 'view-in-browser') {
           task.iconUrl =
               chrome.extension.getURL('images/filetype_generic.png');
           task.title = str('ACTION_VIEW');
         } else if (task_parts[1] == 'install-crx') {
           task.iconUrl =
               chrome.extension.getURL('images/filetype_generic.png');
           task.title = str('INSTALL_CRX');
         }
       }
-      this.taskItems_.addItem(this.renderTaskItem_(task));
       tasksCount++;
       if (defaultTask == null) defaultTask = task;
+
+      // If we have at least two items, then we have to use drop-down list.
+      if (tasksCount == 2)
+        this.taskItems_.addDropDownItem(this.createComboboxItem_(defaultTask));
+
+      if (tasksCount >= 2)
+        this.taskItems_.addDropDownItem(this.createComboboxItem_(task));
     }
 
     this.taskItems_.hidden = tasksCount == 0;
-    if (tasksCount > 1) {
-      // Duplicate default task in drop-down list.
-      this.taskItems_.addItem(this.renderTaskItem_(defaultTask));
-    }
+    if (defaultTask != null)
+      this.taskItems_.defaultItem = createComboboxItem_(defaultTask);
 
     selection.tasksList = tasksList;
     if (selection.dispatchDefault) {
       // We got a request to dispatch the default task for the selection.
       selection.dispatchDefault = false;
       this.dispatchDefaultTask_(selection);
     }
   };
 
-  FileManager.prototype.renderTaskItem_ = function(task) {
-    var item = this.document_.createElement('div');
-    item.className = 'task-item';
-    item.task = task;
-
-    var img = this.document_.createElement('img');
-    img.src = task.iconUrl;
-    item.appendChild(img);
-
-    var label = this.document_.createElement('div');
-    label.appendChild(this.document_.createTextNode(task.title));
-    item.appendChild(label);
-
-    return item;
-  };
-
   FileManager.prototype.getExtensionId_ = function() {
     return chrome.extension.getURL('').split('/')[2];
   };
 
   FileManager.prototype.onExternalLinkClick_ = function(url) {
     chrome.tabs.create({url: url});
     if (this.dialogType_ != FileManager.DialogType.FULL_PAGE) {
       this.onCancel_();
     }
   };
@@ skipping 2126 matching lines @@
 
     function closeBanner() {
       self.cleanupGDataWelcome_();
       // Stop showing the welcome banner.
       localStorage[WELCOME_HEADER_COUNTER_KEY] = WELCOME_HEADER_COUNTER_LIMIT;
     }
 
     return maybeShowBanner;
   };
 })();