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

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

Issue 10834354: Refactor the Photo Editor to enable new feature work (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 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: chrome/browser/resources/file_manager/js/mock_chrome.js
diff --git a/chrome/browser/resources/file_manager/js/mock_chrome.js b/chrome/browser/resources/file_manager/js/mock_chrome.js
index 70173fa4867d89f49a95bae1dfb11bc5f560a64e..8bf0591d667fe3975d4028c1329dd63196ae31ab 100644
--- a/chrome/browser/resources/file_manager/js/mock_chrome.js
+++ b/chrome/browser/resources/file_manager/js/mock_chrome.js
@@ -127,8 +127,7 @@ chrome.fileBrowserPrivate = {
if (urlList.length == 0)
return callback([]);
- // This is how File Manager gets the extension id.
- var extensionId = chrome.extension.getURL('').split('/')[2];
+ var extensionId = util.getExtensionId();
if (!callback)
throw new Error('Missing callback');
@@ -157,7 +156,13 @@ chrome.fileBrowserPrivate = {
taskId: 'fake-extension-id|fake-item',
title: 'External action',
regexp: /\.(bmp|gif|jpe?g|png|webp|3gp|avi|m4v|mov|mp4|mpeg4?|mpg4?|ogm|ogv|ogx|webm)$/i,
- iconUrl: 'images/icon16.png'
+ iconUrl: 'images/files/file_types/generic.png'
+ },
+ {
+ taskId: 'fake-extension-id|upload',
+ title: 'Upload video',
+ regexp: /\.(3gp|avi|m4v|mov|mp4|mpeg4?|mpg4?|ogm|ogv|ogx|webm)$/i,
+ iconUrl: 'images/files/file_types/video.png'
},
{
taskId: extensionId + '|view-in-browser',
« no previous file with comments | « chrome/browser/resources/file_manager/js/media/util.js ('k') | chrome/browser/resources/file_manager/js/photo/gallery.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698