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

Unified Diff: chrome/test/data/extensions/api_test/file_manager_browsertest/file_manager/tasks.js

Issue 700023002: Show generic file handler more modestly. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed nits. Created 6 years, 1 month 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/test/data/extensions/api_test/file_manager_browsertest/file_manager/tasks.js
diff --git a/chrome/test/data/extensions/api_test/file_manager_browsertest/file_manager/tasks.js b/chrome/test/data/extensions/api_test/file_manager_browsertest/file_manager/tasks.js
index b0687b93676a9fa3aff495e961f607e702eecb2e..9e444f281ed0ac6eb811be0c334ec122d651f7d5 100644
--- a/chrome/test/data/extensions/api_test/file_manager_browsertest/file_manager/tasks.js
+++ b/chrome/test/data/extensions/api_test/file_manager_browsertest/file_manager/tasks.js
@@ -10,14 +10,17 @@
* @param {boolean} isDefault Whether the task is default or not.
* @param {string} taskId Task ID.
* @param {string} title Title of the task.
+ * @param {boolean=} opt_isGenericFileHandler Whether the task is a generic
+ * file handler.
* @constructor
*/
-function FakeTask(isDefault, taskId, title) {
+function FakeTask(isDefault, taskId, title, opt_isGenericFileHandler) {
this.driveApp = false;
this.iconUrl = 'chrome://theme/IDR_DEFAULT_FAVICON'; // Dummy icon
this.isDefault = isDefault;
this.taskId = taskId;
this.title = title;
+ this.isGenericFileHandler = opt_isGenericFileHandler || false;
Object.freeze(this);
}
@@ -214,3 +217,38 @@ testcase.defaultActionDialogOnDownloads = function() {
testPromise(setupTaskTest(RootPath.DOWNLOADS, DOWNLOADS_FAKE_TASKS).then(
defaultActionDialog.bind(null, 'dummytaskid-2|open-with')));
};
+
+testcase.genericTaskIsNotExecuted = function() {
+ var tasks = [
+ new FakeTask(false, 'dummytaskid|open-with', 'DummyAction1',
+ true /* isGenericFileHandler */),
+ new FakeTask(false, 'dummytaskid-2|open-with', 'DummyAction2',
+ true /* isGenericFileHandler */)
+ ];
+
+ // When default task is not set, executeDefaultInternal_ in file_tasks.js
+ // tries to show it in a browser tab. By checking the view-in-browser task is
+ // executed, we check that default task is not set in this situation.
+ //
+ // See: src/ui/file_manager/file_manager/foreground/js/file_tasks.js&l=404
+ testPromise(setupTaskTest(RootPath.DOWNLOADS, tasks)
+ .then(function(windowId) {
+ return executeDefaultTask(
+ FILE_MANAGER_EXTENSIONS_ID + '|file|view-in-browser',
+ windowId);
+ }));
+};
+
+testcase.genericAndNonGenericTasksAreMixed = function() {
+ var tasks = [
+ new FakeTask(false, 'dummytaskid|open-with', 'DummyAction1',
+ true /* isGenericFileHandler */),
+ new FakeTask(false, 'dummytaskid-2|open-with', 'DummyAction2',
+ false /* isGenericFileHandler */),
+ new FakeTask(false, 'dummytaskid-3|open-with', 'DummyAction3',
+ true /* isGenericFileHandler */)
+ ];
+
+ testPromise(setupTaskTest(RootPath.DOWNLOADS, tasks).then(
+ executeDefaultTask.bind(null, 'dummytaskid-2|open-with')));
+}

Powered by Google App Engine
This is Rietveld 408576698