* File operation manager.
* @type {FileOperationManager}
*/
- this.fileOperationManager = FileOperationManager.getInstance();
+ this.fileOperationManager = new FileOperationManager();
/**
* Event handler for progress center.
Object.seal(this);
}
+AppWindowWrapper.prototype = {
+ /**
+ * @return {AppWindow} Wrapped application window.
+ */
+ get rawAppWindow() {
+ return this.window_;
+ }
+};
+
+/**
+ * Focuses the window on the specified desktop.
+ * @param {AppWindow} appWindow Application window.
+ * @param {string=} opt_profileId The profiled ID of the target window. If it is
+ * dropped, the window is focused on the current window.
+ */
+AppWindowWrapper.focusOnDesktop = function(appWindow, opt_profileId) {
+ new Promise(function(onFullfilled, onRejected) {
+ if (opt_profileId) {
+ onFullfilled(opt_profileId);
+ } else {
+ chrome.fileBrowserPrivate.getProfiles(function(profiles,
+ currentId,
+ displayedId) {
+ onFullfilled(currentId);
+ });
+ }
+ }).then(function(profileId) {
+ appWindow.contentWindow.chrome.fileBrowserPrivate.visitDesktop(
+ profileId, function() {
+ appWindow.focus();
+ });
+ });
+};
+
/**
* Shift distance to avoid overlapping windows.
* @type {number}
*/
AppWindowWrapper.SHIFT_DISTANCE = 40;
+/**
+ * Sets the icon of the window.
+ * @param {string} iconPath Path of the icon.
+ */
+AppWindowWrapper.prototype.setIcon = function(iconPath) {
+ this.window_.setIcon(iconPath);
+};
/**
* Opens the window.
this.queue.run(function(nextStep) {
this.window_.contentWindow.appState = appState;
this.window_.contentWindow.reload();
- this.window_.focus();
if (opt_callback)
opt_callback();
nextStep();
/**
* Reopen a window if its state is saved in the local storage.
+ * @param {function()=} opt_callback Completion callback.
*/
-SingletonAppWindowWrapper.prototype.reopen = function() {
+SingletonAppWindowWrapper.prototype.reopen = function(opt_callback) {
chrome.storage.local.get(this.id_, function(items) {
var value = items[this.id_];
- if (!value)
+ if (!value) {
+ opt_callback && opt_callback();
return; // No app state persisted.
+ }
try {
var appState = JSON.parse(value);
} catch (e) {
console.error('Corrupt launch data for ' + this.id_, value);
+ opt_callback && opt_callback();
return;
}
- this.launch(appState);
+ this.launch(appState, opt_callback);
}.bind(this));
};
// Wait until all windows are created.
background.queue.run(function(onTaskCompleted) {
- // Check if there is already a window with the same path. If so, then
+ // Check if there is already a window with the same URL. If so, then
// reuse it instead of opening a new one.
if (type == LaunchType.FOCUS_SAME_OR_CREATE ||
type == LaunchType.FOCUS_ANY_OR_CREATE) {
- if (opt_appState && opt_appState.defaultPath) {
+ if (opt_appState) {
for (var key in background.appWindows) {
if (!key.match(FILES_ID_PATTERN))
continue;
var contentWindow = background.appWindows[key].contentWindow;
- if (contentWindow.appState &&
- opt_appState.defaultPath == contentWindow.appState.defaultPath) {
- background.appWindows[key].focus();
- if (opt_callback)
- opt_callback(key);
- onTaskCompleted();
- return;
+ if (!contentWindow.appState)
+ continue;
+
+ // Different current directories.
+ if (opt_appState.currentDirectoryURL !==
+ contentWindow.appState.currentDirectoryURL) {
+ continue;
+ }
+
+ // Selection URL specified, and it is different.
+ if (opt_appState.selectionURL &&
+ opt_appState.selectionURL !==
+ contentWindow.appState.selectionURL) {
+ continue;
}
+
+ AppWindowWrapper.focusOnDesktop(
+ background.appWindows[key], opt_appState.displayedId);
+ if (opt_callback)
+ opt_callback(key);
+ onTaskCompleted();
+ return;
}
}
}
continue;
if (!background.appWindows[key].isMinimized()) {
- background.appWindows[key].focus();
+ AppWindowWrapper.focusOnDesktop(
+ background.appWindows[key], (opt_appState || {}).displayedId);
if (opt_callback)
opt_callback(key);
onTaskCompleted();
if (!key.match(FILES_ID_PATTERN))
continue;
- background.appWindows[key].focus();
+ AppWindowWrapper.focusOnDesktop(
+ background.appWindows[key], (opt_appState || {}).displayedId);
if (opt_callback)
opt_callback(key);
onTaskCompleted();
appId,
FILE_MANAGER_WINDOW_CREATE_OPTIONS);
appWindow.launch(opt_appState || {}, function() {
+ AppWindowWrapper.focusOnDesktop(
+ appWindow.window_, (opt_appState || {}).displayedId);
if (opt_callback)
opt_callback(appId);
onTaskCompleted();
params: {
action: action
},
- defaultPath: details.entries[0].fullPath
+ // It is not allowed to call getParent() here, since there may be
+ // no permissions to access it at this stage. Therefore we are passing
+ // the selectionURL only, and the currentDirectory will be resolved
+ // later.
+ selectionURL: details.entries[0].toURL()
};
// For mounted devices just focus any Files.app window. The mounted
// volume will appear on the navigation list.
};
/**
- * Audio player window create options.
- * @type {Object}
+ * Icon of the audio player.
+ * TODO(yoshiki): Consider providing an exact size icon, instead of relying
+ * on downsampling by ash.
+ *
+ * @type {string}
* @const
*/
-var AUDIO_PLAYER_CREATE_OPTIONS = Object.freeze({
- type: 'panel',
- hidden: true,
- minHeight: 35 + 58,
- minWidth: 280,
- height: 35 + 58,
- width: 280
-});
+var AUDIO_PLAYER_ICON = 'audio_player/icons/audio-player-64.png';
+
+// The instance of audio player. Until it's ready, this is null.
+var audioPlayer = null;
+
+// Queue to serializes the initialization, launching and reloading of the audio
+// player, so races won't happen.
+var audioPlayerInitializationQueue = new AsyncUtil.Queue();
-var audioPlayer = new SingletonAppWindowWrapper('mediaplayer.html',
- AUDIO_PLAYER_CREATE_OPTIONS);
+audioPlayerInitializationQueue.run(function(callback) {
+ // TODO(yoshiki): Remove '--file-manager-enable-new-audio-player' flag after
+ // the feature is launched.
+ var newAudioPlayerEnabled = true;
+
+ var audioPlayerHTML =
+ newAudioPlayerEnabled ? 'audio_player.html' : 'mediaplayer.html';
+
+ /**
+ * Audio player window create options.
+ * @type {Object}
+ */
+ var audioPlayerCreateOptions = Object.freeze({
+ type: 'panel',
+ hidden: true,
+ minHeight: newAudioPlayerEnabled ? 116 : (35 + 58),
+ minWidth: newAudioPlayerEnabled ? 292 : 280,
+ height: newAudioPlayerEnabled ? 356 : (35 + 58),
+ width: newAudioPlayerEnabled ? 292 : 280,
+ });
+
+ audioPlayer = new SingletonAppWindowWrapper(audioPlayerHTML,
+ audioPlayerCreateOptions);
+ callback();
+});
/**
- * Launch the audio player.
+ * Launches the audio player.
* @param {Object} playlist Playlist.
- */
-function launchAudioPlayer(playlist) {
- audioPlayer.launch(playlist);
+ * @param {string=} opt_displayedId ProfileID of the desktop where the audio
+ * player should show.
+ */
+function launchAudioPlayer(playlist, opt_displayedId) {
+ audioPlayerInitializationQueue.run(function(callback) {
+ audioPlayer.launch(playlist, function(appWindow) {
+ audioPlayer.setIcon(AUDIO_PLAYER_ICON);
+ AppWindowWrapper.focusOnDesktop(audioPlayer.rawAppWindow,
+ opt_displayedId);
+ });
+ callback();
+ });
}
var videoPlayer = new SingletonAppWindowWrapper('video_player.html',
{hidden: true});
/**
- * Launch the video player.
+ * Launches the video player.
* @param {string} url Video url.
+ * @param {string=} opt_displayedId ProfileID of the desktop where the video
+ * player should show.
*/
-function launchVideoPlayer(url) {
- videoPlayer.launch({url: url});
+function launchVideoPlayer(url, opt_displayedId) {
+ videoPlayer.launch({url: url}, function(appWindow) {
+ AppWindowWrapper.focusOnDesktop(videoPlayer.rawAppWindow, opt_displayedId);
+ });
}
/**
}
});
- // Reopen sub-applications.
- audioPlayer.reopen();
+ // Reopen audio player.
+ audioPlayerInitializationQueue.run(function(callback) {
+ audioPlayer.reopen(function() {
+ audioPlayer.setIcon(AUDIO_PLAYER_ICON);
+ });
+ callback();
+ });
+
+ // Reopen video player.
videoPlayer.reopen();
};
*/
Background.prototype.onContextMenuClicked_ = function(info) {
if (info.menuItemId == 'new-window') {
- // Find the focused window (if any) and use it's current path for the
- // new window. If not found, then launch with the default path.
+ // Find the focused window (if any) and use it's current url for the
+ // new window. If not found, then launch with the default url.
for (var key in background.appWindows) {
try {
if (background.appWindows[key].contentWindow.isFocused()) {
var appState = {
- defaultPath: background.appWindows[key].contentWindow.
- appState.defaultPath
+ // Do not clone the selection url, only the current directory.
+ currentDirectoryURL: background.appWindows[key].contentWindow.
+ appState.currentDirectoryURL
};
launchFileManager(appState);
return;
}
}
- // Launch with the default path.
+ // Launch with the default URL.
launchFileManager();
}
};
projects / platform / framework / web / crosswalk.git / blobdiff