Commit fe81de82 authored by hirono@chromium.org's avatar hirono@chromium.org

Gallery.app: Fix the task list of the separated version of Gallery.

This CL:
 * filters the task of Gallery.app itself.
 * allows the gallery.app to load task icons.

BUG=358698
TEST=None

Review URL: https://codereview.chromium.org/282303006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271012 0039d316-1c4b-4281-b951-d872f2087c98
parent 3b173911
......@@ -788,7 +788,13 @@ Gallery.prototype.updateShareMenu_ = function() {
for (var t = 0; t !== tasks.length; t++) {
var task = tasks[t];
if (!isShareAction(task)) continue;
if (!isShareAction(task))
continue;
// Filter out Files.app tasks.
// TODO(hirono): Remove the hack after the files.app's handlers are
// removed.
if (task.taskId.indexOf('hhaomjibdihmijegdhdafkllkbggdgoj|') === 0)
continue;
var item = util.createChild(this.shareMenu_, 'item');
item.textContent = task.title;
......
......@@ -19,8 +19,9 @@
"mediaPlayerPrivate",
"metricsPrivate",
"storage",
"chrome://theme/",
"chrome://extension-icon/",
"chrome://resources/",
"chrome://theme/",
"chrome-extension://hhaomjibdihmijegdhdafkllkbggdgoj"
],
"file_handlers": {
......@@ -60,6 +61,6 @@
"js/background.js"
]
},
"content_security_policy": "default-src 'none'; script-src 'self' chrome://resources chrome-extension://hhaomjibdihmijegdhdafkllkbggdgoj; style-src 'self' 'unsafe-inline'; img-src 'self' chrome://resources chrome://theme data:; media-src 'self'; object-src 'self';"
"content_security_policy": "default-src 'none'; script-src 'self' chrome://resources chrome-extension://hhaomjibdihmijegdhdafkllkbggdgoj; style-src 'self' 'unsafe-inline'; img-src 'self' chrome://resources chrome://theme data: https://*.googleusercontent.com chrome://extension-icon; media-src 'self'; object-src 'self';"
}
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment