Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(250)

Unified Diff: ui/file_manager/file_manager/foreground/js/file_manager.js

Issue 530553006: Remove "Move window to..." from gear menu. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/file_manager/file_manager/foreground/js/file_manager.js
diff --git a/ui/file_manager/file_manager/foreground/js/file_manager.js b/ui/file_manager/file_manager/foreground/js/file_manager.js
index 9fee8853de40d73a6c302b78e4f81773e9f7ebcc..7ca5611b8c2bc898bda5fb5334d95bb1f5b982ea 100644
--- a/ui/file_manager/file_manager/foreground/js/file_manager.js
+++ b/ui/file_manager/file_manager/foreground/js/file_manager.js
@@ -478,12 +478,6 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52;
this.gearButton_ = this.dialogDom_.querySelector('#gear-button');
this.gearButton_.addEventListener('menushow',
this.onShowGearMenu_.bind(this));
- chrome.fileBrowserPrivate.onDesktopChanged.addListener(function() {
- this.updateVisitDesktopMenus_();
- }.bind(this));
- chrome.fileBrowserPrivate.onProfileAdded.addListener(
- this.updateVisitDesktopMenus_.bind(this));
- this.updateVisitDesktopMenus_();
this.dialogDom_.querySelector('#gear-menu').menuItemSelector =
'menuitem, hr';
@@ -2155,62 +2149,6 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52;
};
/**
- * Update menus that move the window to the other profile's desktop.
- * TODO(hirono): Add the GearMenu class and make it a member of the class.
- * TODO(hirono): Handle the case where a profile is added while the menu is
- * opened.
- * @private
- */
- FileManager.prototype.updateVisitDesktopMenus_ = function() {
- var gearMenu = this.document_.querySelector('#gear-menu');
- var separator =
- this.document_.querySelector('#multi-profile-separator');
-
- // Remove existing menu items.
- var oldItems =
- this.document_.querySelectorAll('#gear-menu .visit-desktop');
- for (var i = 0; i < oldItems.length; i++) {
- gearMenu.removeChild(oldItems[i]);
- }
- separator.hidden = true;
-
- if (this.dialogType !== DialogType.FULL_PAGE)
- return;
-
- // Obtain the profile information.
- chrome.fileBrowserPrivate.getProfiles(function(profiles,
- currentId,
- displayedId) {
- // Check if the menus are needed or not.
- var insertingPosition = separator.nextSibling;
- if (profiles.length === 1 && profiles[0].profileId === displayedId)
- return;
-
- separator.hidden = false;
- for (var i = 0; i < profiles.length; i++) {
- var profile = profiles[i];
- if (profile.profileId === displayedId)
- continue;
- var item = this.document_.createElement('menuitem');
- cr.ui.MenuItem.decorate(item);
- gearMenu.insertBefore(item, insertingPosition);
- item.className = 'visit-desktop';
- item.label = strf('VISIT_DESKTOP_OF_USER',
- profile.displayName,
- profile.profileId);
- item.addEventListener('activate', function(inProfile, 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.gearButton_.blur();
- chrome.fileBrowserPrivate.visitDesktop(inProfile.profileId);
- }.bind(this, profile));
- }
- }.bind(this));
- };
-
- /**
* Refreshes space info of the current volume.
* @param {boolean} showLoadingCaption Whether show loading caption or not.
* @private

Powered by Google App Engine
This is Rietveld 408576698