Photo Editor: Fix the Share button

chrome/browser/resources/file_manager/js/image_editor/gallery.js

 // Copyright (c) 2011 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.
 
 /*
  * Base class that Ribbon uses to display photos.
  */
 
 function RibbonClient() {}
 
@@ skipping 140 matching lines @@
       this.editBarModeWrapper_,
       Gallery.editorModes,
       this.displayStringFunction_);
 
   this.imageView_ = this.editor_.getImageView();
 
   this.editor_.trackWindow(doc.defaultView);
 
   if (shareActions.length > 0) {
     this.shareMode_ = new ShareMode(
-        this.container_, this.toolbar_, shareActions,
+        this.editor_, this.container_, this.toolbar_, shareActions,
         this.onShare_.bind(this), this.onActionExecute_.bind(this),
         this.displayStringFunction_);
-
   } else {
     this.shareMode_ = null;
   }
 };
 
 Gallery.prototype.load = function(parentDirEntry, items, selectedItem) {
   this.parentDirEntry_ = parentDirEntry;
 
   var urls = [];
   var selectedIndex = -1;
@@ skipping 79 matching lines @@
   this.editor_.closeSession(this.saveItem_.bind(this, item, null));
 };
 
 Gallery.prototype.isEditing_ = function() {
   return this.container_.hasAttribute('editing');
 };
 
 Gallery.prototype.onEdit_ = function() {
   ImageUtil.setAttribute(this.container_, 'editing', !this.isEditing_());
 
+  // The user has just clicked on the Edit button. Dismiss the Share menu.
+  if (this.isSharing_()) {
+    this.onShare_();
+  }
+
   // isEditing_ has just been flipped to a new value.
   if (this.isEditing_()) {
     this.cancelFading_();
-  } else if (!this.isSharing_()) {
+  } else {
     var item = this.ribbon_.getSelectedItem();
     this.editor_.requestImage(item.updateThumbnail.bind(item));
     this.initiateFading_();
   }
 
   ImageUtil.setAttribute(this.editButton_, 'pressed', this.isEditing_());
 };
 
 Gallery.prototype.isSharing_ = function(event) {
   return this.shareMode_ && this.shareMode_ == this.editor_.getMode();
@@ skipping 654 matching lines @@
         image.style.maxHeight = '';
         resizeToFill(image, image.width / image.height);
       }
       img.onload = onLoad.bind(null, img);
     }
 
     img.setAttribute('src', url);
   }
 };
 
-function ShareMode(container, toolbar, shareActions,
+function ShareMode(editor, container, toolbar, shareActions,
                    onClick, actionCallback, displayStringFunction) {
   ImageEditor.Mode.call(this, 'share');
 
   this.message_ = null;
 
   var doc = container.ownerDocument;
-  this.button_ = doc.createElement('div');
-  this.button_.className = 'button share';
-  this.button_.textContent = displayStringFunction('share');
-  this.button_.addEventListener('click', onClick);
-  toolbar.appendChild(this.button_);
+  var button = doc.createElement('div');
+  button.className = 'button share';
+  button.textContent = displayStringFunction('share');
+  button.addEventListener('click', onClick);
+  toolbar.appendChild(button);
+
+  this.bind(editor, button);
 
   this.menu_ = doc.createElement('div');
   this.menu_.className = 'share-menu';
   this.menu_.setAttribute('hidden', 'hidden');
   for (var index = 0; index < shareActions.length; index++) {
     var action = shareActions[index];
     var row = doc.createElement('div');
     var img = doc.createElement('img');
     img.src = action.iconUrl;
     row.appendChild(img);
@@ skipping 12 matching lines @@
 ShareMode.prototype.setUp = function() {
   ImageEditor.Mode.prototype.setUp.apply(this, arguments);
   ImageUtil.setAttribute(this.menu_, 'hidden', false);
   ImageUtil.setAttribute(this.button_, 'pressed', false);
 };
 
 ShareMode.prototype.cleanUpUI = function() {
   ImageEditor.Mode.prototype.cleanUpUI.apply(this, arguments);
   ImageUtil.setAttribute(this.menu_, 'hidden', true);
 };