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

Unified Diff: chrome/test/data/extensions/platform_apps/web_view/main.js

Issue 11368071: browser-plugin: Remove event handling code, and use CustomEvents in webkit instead. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 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/platform_apps/web_view/main.js
diff --git a/chrome/test/data/extensions/platform_apps/web_view/main.js b/chrome/test/data/extensions/platform_apps/web_view/main.js
index 9fcea5f2df96640d5c692d0c416ca2ad6c4a484f..cdb17b6c8667a4fdc1455c12e76f511264bd3f55 100644
--- a/chrome/test/data/extensions/platform_apps/web_view/main.js
+++ b/chrome/test/data/extensions/platform_apps/web_view/main.js
@@ -132,16 +132,16 @@ onload = function() {
setTimeout(function() {
webview.addEventListener('loadstart', function(evt) {
- chrome.test.assertEq('loadstart', evt.name);
+ chrome.test.assertEq('loadstart', evt.type);
});
webview.addEventListener('loadstop', function(evt) {
- chrome.test.assertEq('loadstop', evt.name);
+ chrome.test.assertEq('loadstop', evt.type);
webview.terminate();
});
webview.addEventListener('exit', function(evt) {
- chrome.test.assertEq('exit', evt.name);
+ chrome.test.assertEq('exit', evt.type);
chrome.test.succeed();
});
@@ -174,13 +174,13 @@ onload = function() {
};
var onLoadCommitA = function(e) {
- chrome.test.assertEq('loadcommit', e.name);
+ chrome.test.assertEq('loadcommit', e.type);
if (e.url == url) {
updateLoadCommitCount();
}
};
var onLoadCommitB = function(e) {
- chrome.test.assertEq('loadcommit', e.name);
+ chrome.test.assertEq('loadcommit', e.type);
if (e.url == url) {
updateLoadCommitCount();
}
@@ -278,7 +278,7 @@ onload = function() {
};
var onLoadCommitA = function(e) {
- chrome.test.assertEq('loadcommit', e.name);
+ chrome.test.assertEq('loadcommit', e.type);
switch (e.url) {
case urlStep1: // Step 1.
chrome.test.log('Step 1. onLoadCommitA');
@@ -300,7 +300,7 @@ onload = function() {
};
var onLoadCommitB = function(e) {
- chrome.test.assertEq('loadcommit', e.name);
+ chrome.test.assertEq('loadcommit', e.type);
switch (e.url) {
case urlStep1: // Step 1.
chrome.test.log('Step 1. onLoadCommitB');
@@ -322,7 +322,7 @@ onload = function() {
};
var onLoadCommitC = function(e) {
- chrome.test.assertEq('loadcommit', e.name);
+ chrome.test.assertEq('loadcommit', e.type);
switch (e.url) {
case urlStep1: // Step 1.
chrome.test.fail();
@@ -359,7 +359,7 @@ onload = function() {
var maybeFinishTest = function(e) {
if (loadCommitACalled && loadCommitBCalled) {
- chrome.test.assertEq('loadcommit', e.name);
+ chrome.test.assertEq('loadcommit', e.type);
chrome.test.assertTrue(e.isTopLevel);
chrome.test.succeed();
}
@@ -367,24 +367,24 @@ onload = function() {
var onLoadCommitA = function(e) {
if (e.url == url) {
- chrome.test.assertEq('loadcommit', e.name);
+ chrome.test.assertEq('loadcommit', e.type);
chrome.test.assertTrue(e.isTopLevel);
chrome.test.assertFalse(loadCommitACalled);
loadCommitACalled = true;
// Try mucking with properities inside |e|.
- e.name = 'modified';
+ e.type = 'modified';
e.isTopLevel = 'string-value';
maybeFinishTest(e);
}
};
var onLoadCommitB = function(e) {
if (e.url == url) {
- chrome.test.assertEq('loadcommit', e.name);
+ chrome.test.assertEq('loadcommit', e.type);
chrome.test.assertTrue(e.isTopLevel);
chrome.test.assertFalse(loadCommitBCalled);
loadCommitBCalled = true;
// Try mucking with properities inside |e|.
- e.name = 'modified';
+ e.type = 'modified';
e.isTopLevel = 'string-value';
maybeFinishTest(e);
}
« no previous file with comments | « no previous file | content/renderer/browser_plugin/browser_plugin.h » ('j') | content/renderer/browser_plugin/browser_plugin.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698