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

Unified Diff: chrome/browser/resources/file_manager/js/file_manager.js

Issue 8799006: Replace the Slideshow with the Photo Editor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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: chrome/browser/resources/file_manager/js/file_manager.js
diff --git a/chrome/browser/resources/file_manager/js/file_manager.js b/chrome/browser/resources/file_manager/js/file_manager.js
index bbf220269178eef97a40603294ff4fecdeccfa02..917ff7bc321047de52facb9d3a04714f969d4436 100644
--- a/chrome/browser/resources/file_manager/js/file_manager.js
+++ b/chrome/browser/resources/file_manager/js/file_manager.js
@@ -7,8 +7,6 @@
const EMPTY_IMAGE_URI = 'data:image/gif;base64,'
+ 'R0lGODlhAQABAPABAP///wAAACH5BAEKAAAALAAAAAABAAEAAAICRAEAOw%3D%3D';
-var g_slideshow_data = null;
-
// If directory files changes too often, don't rescan directory more than once
// per specified interval
const SIMULTANEOUS_RESCAN_INTERVAL = 1000;
@@ -2082,15 +2080,7 @@ FileManager.prototype = {
var task_parts = task.taskId.split('|');
if (task_parts[0] == this.getExtensionId_()) {
task.internal = true;
- if (task_parts[1] == 'preview') {
- // TODO(serya): This hack needed until task.iconUrl get working
dgozman 2011/12/05 11:47:34 I think, you should keep this TODO (just move it b
Vladislav Kaznacheev 2011/12/05 13:40:11 Done.
- // (see GetFileTasksFileBrowserFunction::RunImpl).
- task.iconUrl =
- chrome.extension.getURL('images/icon_preview_16x16.png');
- task.title = str('PREVIEW_IMAGE');
- // Do not create the Slideshow button if the Gallery is present.
- if (str('ENABLE_PHOTO_EDITOR')) continue;
- } else if (task_parts[1] == 'play') {
+ if (task_parts[1] == 'play') {
task.iconUrl =
chrome.extension.getURL('images/icon_play_16x16.png');
task.title = str('PLAY_MEDIA').replace("&", "");
@@ -2107,9 +2097,6 @@ FileManager.prototype = {
chrome.extension.getURL('images/icon_preview_16x16.png');
task.title = str('GALLERY');
task.allTasks = tasksList;
-
- // Skip the button creation.
- if (!str('ENABLE_PHOTO_EDITOR')) continue;
this.galleryTask_ = task;
}
}
@@ -2298,10 +2285,7 @@ FileManager.prototype = {
*/
FileManager.prototype.onFileTaskExecute_ = function(id, details) {
var urls = details.urls;
- if (id == 'preview') {
- g_slideshow_data = urls;
- chrome.tabs.create({url: "slideshow.html"});
- } else if (id == 'play' || id == 'enqueue') {
+ if (id == 'play' || id == 'enqueue') {
chrome.fileBrowserPrivate.viewFiles(urls, id);
} else if (id == 'mount-archive') {
for (var index = 0; index < urls.length; ++index) {

Powered by Google App Engine
This is Rietveld 408576698