projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 9.38.198.0
[platform/framework/web/crosswalk.git]
/
src
/
ui
/
file_manager
/
file_manager
/
background
/
js
/
test_util.js
diff --git
a/src/ui/file_manager/file_manager/background/js/test_util.js
b/src/ui/file_manager/file_manager/background/js/test_util.js
index
3b8213d
..
a6d228a
100644
(file)
--- a/
src/ui/file_manager/file_manager/background/js/test_util.js
+++ b/
src/ui/file_manager/file_manager/background/js/test_util.js
@@
-61,14
+61,14
@@
test.util.sync.getWindows = function() {
for (var id in background.appWindows) {
var windowWrapper = background.appWindows[id];
windows[id] = {
for (var id in background.appWindows) {
var windowWrapper = background.appWindows[id];
windows[id] = {
-
innerWidth: windowWrapper.contentWindow.inn
erWidth,
-
innerHeight: windowWrapper.contentWindow.inn
erHeight
+
outerWidth: windowWrapper.contentWindow.out
erWidth,
+
outerHeight: windowWrapper.contentWindow.out
erHeight
};
}
for (var id in background.dialogs) {
windows[id] = {
};
}
for (var id in background.dialogs) {
windows[id] = {
-
innerWidth: background.dialogs[id].inn
erWidth,
-
innerHeight: background.dialogs[id].inn
erHeight
+
outerWidth: background.dialogs[id].out
erWidth,
+
outerHeight: background.dialogs[id].out
erHeight
};
}
return windows;
};
}
return windows;
@@
-565,7
+565,7
@@
test.util.sync.overrideInstallWebstoreItemApi =
message ? {message: message} : null;
};
message ? {message: message} : null;
};
- var installWebstoreItem = function(itemId, callback) {
+ var installWebstoreItem = function(itemId,
silentInstallation,
callback) {
setTimeout(function() {
if (itemId !== expectedItemId) {
setLastError('Invalid Chrome Web Store item ID');
setTimeout(function() {
if (itemId !== expectedItemId) {
setLastError('Invalid Chrome Web Store item ID');
@@
-593,7
+593,7
@@
test.util.sync.overrideInstallWebstoreItemApi =
* @return {boolean} Always return true.
*/
test.util.sync.overrideTasks = function(contentWindow, taskList) {
* @return {boolean} Always return true.
*/
test.util.sync.overrideTasks = function(contentWindow, taskList) {
- var getFileTasks = function(urls,
mime,
onTasks) {
+ var getFileTasks = function(urls, onTasks) {
// Call onTask asynchronously (same with original getFileTasks).
setTimeout(function() {
onTasks(taskList);
// Call onTask asynchronously (same with original getFileTasks).
setTimeout(function() {
onTasks(taskList);