Index: chrome/test/data/extensions/api_test/management/test/launchType.js |
diff --git a/chrome/test/data/extensions/api_test/management/test/launchType.js b/chrome/test/data/extensions/api_test/management/test/launchType.js |
index b2d40f3ce6a13c06556fe24596f3fd4d637b9e8c..db35e6c7003fa50b49aa03a0b19fd670fda43466 100644 |
--- a/chrome/test/data/extensions/api_test/management/test/launchType.js |
+++ b/chrome/test/data/extensions/api_test/management/test/launchType.js |
@@ -32,6 +32,11 @@ function getAvailableLaunchTypes(app) { |
types.push("OPEN_AS_REGULAR_TAB"); |
types.push("OPEN_AS_WINDOW"); |
+ if (navigator.userAgent.indexOf("CrOS") == -1) { |
+ types.push("OPEN_AS_PINNED_TAB"); |
+ types.push("OPEN_FULL_SCREEN"); |
+ } |
+ |
return types; |
} |
@@ -59,6 +64,13 @@ function testSetAllLaunchTypes(app) { |
} else { |
testSetLaunchType(app.id, type, null, function() { |
chrome.management.get(app.id, function(item) { |
+ if (navigator.userAgent.indexOf("Mac") != -1) { |
+ // In the current configuration, with the new bookmark app flow |
+ // disabled, hosted apps set to open in a window on Mac will open |
+ // instead in a tab. |
+ if (item.type != 'packaged_app' && type == 'OPEN_AS_WINDOW') |
+ type = 'OPEN_AS_REGULAR_TAB'; |
+ } |
assertEq(type, item.launchType); |
setNextLaunchType(); |
}); |