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

Unified Diff: chrome/renderer/resources/extensions/app_view.js

Issue 444813002: Remove BrowserPlugin's -internal-attach method (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Don't crash on tear down Created 6 years, 4 months 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/renderer/resources/extensions/app_view.js
diff --git a/chrome/renderer/resources/extensions/app_view.js b/chrome/renderer/resources/extensions/app_view.js
index e73b53a3e3be9531a29f6594c7a09755da6ac7ca..7b48fe1d660ddda827ea4d2d7474ba061f967a54 100644
--- a/chrome/renderer/resources/extensions/app_view.js
+++ b/chrome/renderer/resources/extensions/app_view.js
@@ -6,6 +6,7 @@ var DocumentNatives = requireNative('document_natives');
var GuestViewInternal =
require('binding').Binding.create('guestViewInternal').generate();
var IdGenerator = requireNative('id_generator');
+var guestViewInternalNatives = requireNative('guest_view_internal');
function AppViewInternal(appviewNode) {
privates(appviewNode).internal = this;
@@ -48,32 +49,35 @@ AppViewInternal.prototype.connect = function(app, data, callback) {
GuestViewInternal.createGuest(
'appview',
createParams,
- function(instanceId) {
- if (!instanceId) {
- self.browserPluginNode.style.visibility = 'hidden';
+ function(guestInstanceId) {
+ if (!guestInstanceId) {
+ this.browserPluginNode.style.visibility = 'hidden';
var errorMsg = 'Unable to connect to app "' + app + '".';
window.console.warn(errorMsg);
- self.getErrorNode().innerText = errorMsg;
+ this.getErrorNode().innerText = errorMsg;
if (callback) {
callback(false);
}
return;
}
- self.attachWindow(instanceId);
+ this.attachWindow(guestInstanceId);
if (callback) {
callback(true);
}
- }
+ }.bind(this)
);
};
-AppViewInternal.prototype.attachWindow = function(instanceId) {
- this.instanceId = instanceId;
+AppViewInternal.prototype.attachWindow = function(guestInstanceId) {
+ this.guestInstanceId = guestInstanceId;
var params = {
'instanceId': this.viewInstanceId,
};
this.browserPluginNode.style.visibility = 'visible';
- return this.browserPluginNode['-internal-attach'](instanceId, params);
+ return guestViewInternalNatives.AttachGuest(
+ parseInt(this.browserPluginNode.getAttribute('internalinstanceid')),
+ guestInstanceId,
+ params);
};
function registerBrowserPluginElement() {

Powered by Google App Engine
This is Rietveld 408576698