[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 2117 matching lines @@
       if (!entry)
         continue;
 
       selection.entries.push(entry);
       selection.urls.push(entry.toURL());
 
       if (thumbnailCount < MAX_PREVIEW_THUMBAIL_COUNT) {
         var box = this.document_.createElement('div');
         box.className = 'thumbnail';
         function imageLoadCalback(index, box, img, transform) {
-          if (index == 0)
-            thumbnails.insertBefore(self.renderThumbnailZoom_(img, transform),
-                                    thumbnails.firstChild);
+          if (index == 0) {

[dgozman, 2012/05/18 13:15:14]

Merge these changes.

[Dmitry Zvorygin, 2012/05/21 10:51:01]

Done.

+            var thumbnailZoom = self.renderThumbnailZoom_(img, transform);
+            if (thumbnailZoom) {
+              thumbnails.insertBefore(thumbnailZoom, thumbnails.firstChild);
+            }
+          }
           onThumbnailLoaded();
         }
         var thumbnail = this.renderThumbnailBox_(entry, true,
             imageLoadCalback.bind(null, thumbnailCount, box));
         thumbnailCount++;
         box.appendChild(thumbnail);
         box.style.zIndex = MAX_PREVIEW_THUMBAIL_COUNT + 1 - i;
         box.addEventListener('click',
             this.dispatchDefaultTask_.bind(this, selection));
 
@@ skipping 78 matching lines @@
    * @param {HTMLElement} img Loaded image.
    * @param {Object} transform Image transformation description.
    * @return {Element} Created element.
    */
   FileManager.prototype.renderThumbnailZoom_ = function(img, transform) {
     var width = img.width;
     var height = img.height;
     var THUMBNAIL_SIZE = 45;
 
     if (width < THUMBNAIL_SIZE * 2 && height < THUMBNAIL_SIZE * 2)
-      return;
+      return null;
 
     var scale = Math.min(1,
         IMAGE_HOVER_PREVIEW_SIZE / Math.max(width, height));
 
     var imageWidth = Math.round(width * scale);
     var imageHeight = Math.round(height * scale);
 
     var largeImage = this.document_.createElement('img');
     if (scale < 0.3) {
       // Scaling large images kills animation. Downscale it in advance.
@@ skipping 173 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));
+      if (tasksList.length > 1)

[dgozman, 2012/05/18 13:15:14]

This is wrong. tasksList.length is not equal to tasksCount, since we can remove
some tasks from the list.

[Dmitry Zvorygin, 2012/05/21 10:51:01]

Good point! Fixed.

+        this.taskItems_.addItem({label: task.title,
+            iconUrl: task.iconUrl, task: task});
       tasksCount++;
       if (defaultTask == null) defaultTask = 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 = ({label: defaultTask.title,
+          iconUrl: defaultTask.iconUrl, task: 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 2004 matching lines @@
 
     this.directoryModel_.addEventListener('scan-completed', maybeShowBanner);
     this.directoryModel_.addEventListener('rescan-completed', maybeShowBanner);
 
     var style = this.document_.createElement('link');
     style.rel = 'stylesheet';
     style.href = 'css/gdrive_welcome.css';
     this.document_.head.appendChild(style);
   };
 })();