Remove BrowserPlugin's -internal-attach method

chrome/renderer/resources/extensions/web_view_events.js

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Event management for WebViewInternal.
 
 var DeclarativeWebRequestSchema =
     requireNative('schema_registry').GetSchema('declarativeWebRequest');
 var EventBindings = require('event_bindings');
 var IdGenerator = requireNative('id_generator');
@@ skipping 315 matching lines @@
   var validateCall = function() {
     var ERROR_MSG_DIALOG_ACTION_ALREADY_TAKEN = '<webview>: ' +
         'An action has already been taken for this "dialog" event.';
 
     if (actionTaken) {
       throw new Error(ERROR_MSG_DIALOG_ACTION_ALREADY_TAKEN);
     }
     actionTaken = true;
   };
 
-  var getInstanceId = function() {
-    return self.webViewInternal.getInstanceId();
+  var getGuestInstanceId = function() {
+    return self.webViewInternal.getGuestInstanceId();
   };
 
   var dialog = {
     ok: function(user_input) {
       validateCall();
       user_input = user_input || '';
-      WebView.setPermission(getInstanceId(), requestId, 'allow', user_input);
+      WebView.setPermission(getGuestInstanceId(), requestId, 'allow',
+                            user_input);
     },
     cancel: function() {
       validateCall();
-      WebView.setPermission(getInstanceId(), requestId, 'deny');
+      WebView.setPermission(getGuestInstanceId(), requestId, 'deny');
     }
   };
   webViewEvent.dialog = dialog;
 
   var defaultPrevented = !self.webViewInternal.dispatchEvent(webViewEvent);
   if (actionTaken) {
     return;
   }
 
   if (defaultPrevented) {
     // Tell the JavaScript garbage collector to track lifetime of |dialog| and
     // call back when the dialog object has been collected.
     MessagingNatives.BindToGC(dialog, function() {
       // Avoid showing a warning message if the decision has already been made.
       if (actionTaken) {
         return;
       }
       WebView.setPermission(
-          getInstanceId(), requestId, 'default', '', function(allowed) {
+          getGuestInstanceId(), requestId, 'default', '', function(allowed) {
         if (allowed) {
           return;
         }
         showWarningMessage(event.messageType);
       });
     });
   } else {
     actionTaken = true;
     // The default action is equivalent to canceling the dialog.
     WebView.setPermission(
-        getInstanceId(), requestId, 'default', '', function(allowed) {
+        getGuestInstanceId(), requestId, 'default', '', function(allowed) {
       if (allowed) {
         return;
       }
       showWarningMessage(event.messageType);
     });
   }
 };
 
 WebViewEvents.prototype.handleLoadAbortEvent = function(event, webViewEvent) {
   var showWarningMessage = function(reason) {
@@ skipping 23 matching lines @@
   var ERROR_MSG_WEBVIEW_EXPECTED = '<webview> element expected.';
 
   var showWarningMessage = function() {
     var WARNING_MSG_NEWWINDOW_BLOCKED = '<webview>: A new window was blocked.';
     window.console.warn(WARNING_MSG_NEWWINDOW_BLOCKED);
   };
 
   var requestId = event.requestId;
   var actionTaken = false;
   var self = this;
-  var getInstanceId = function() {
-    return self.webViewInternal.getInstanceId();
+  var getGuestInstanceId = function() {
+    return self.webViewInternal.getGuestInstanceId();
   };
 
   var validateCall = function () {
     if (actionTaken) {
       throw new Error(ERROR_MSG_NEWWINDOW_ACTION_ALREADY_TAKEN);
     }
     actionTaken = true;
   };
 
   var windowObj = {
@@ skipping 16 matching lines @@
         var attached = webViewInternal.attachWindow(event.windowId, true);
 
         if (!attached) {
           window.console.error(ERROR_MSG_NEWWINDOW_UNABLE_TO_ATTACH);
         }
         // If the object being passed into attach is not a valid <webview>
         // then we will fail and it will be treated as if the new window
         // was rejected. The permission API plumbing is used here to clean
         // up the state created for the new window if attaching fails.
         WebView.setPermission(
-            getInstanceId(), requestId, attached ? 'allow' : 'deny');
+            getGuestInstanceId(), requestId, attached ? 'allow' : 'deny');
       }, 0);
     },
     discard: function() {
       validateCall();
-      WebView.setPermission(getInstanceId(), requestId, 'deny');
+      WebView.setPermission(getGuestInstanceId(), requestId, 'deny');
     }
   };
   webViewEvent.window = windowObj;
 
   var defaultPrevented = !self.webViewInternal.dispatchEvent(webViewEvent);
   if (actionTaken) {
     return;
   }
 
   if (defaultPrevented) {
     // Make browser plugin track lifetime of |windowObj|.
     MessagingNatives.BindToGC(windowObj, function() {
       // Avoid showing a warning message if the decision has already been made.
       if (actionTaken) {
         return;
       }
       WebView.setPermission(
-          getInstanceId(), requestId, 'default', '', function(allowed) {
+          getGuestInstanceId(), requestId, 'default', '', function(allowed) {
         if (allowed) {
           return;
         }
         showWarningMessage();
       });
     });
   } else {
     actionTaken = true;
     // The default action is to discard the window.
     WebView.setPermission(
-        getInstanceId(), requestId, 'default', '', function(allowed) {
+        getGuestInstanceId(), requestId, 'default', '', function(allowed) {
       if (allowed) {
         return;
       }
       showWarningMessage();
     });
   }
 };
 
 WebViewEvents.prototype.getPermissionTypes = function() {
   var permissions =
@@ skipping 14 matching lines @@
 
   var showWarningMessage = function(permission) {
     var WARNING_MSG_PERMISSION_DENIED = '<webview>: ' +
         'The permission request for "%1" has been denied.';
     window.console.warn(
         WARNING_MSG_PERMISSION_DENIED.replace('%1', permission));
   };
 
   var requestId = event.requestId;
   var self = this;
-  var getInstanceId = function() {
-    return self.webViewInternal.getInstanceId();
+  var getGuestInstanceId = function() {
+    return self.webViewInternal.getGuestInstanceId();
   };
 
   if (this.getPermissionTypes().indexOf(event.permission) < 0) {
     // The permission type is not allowed. Trigger the default response.
     WebView.setPermission(
-        getInstanceId(), requestId, 'default', '', function(allowed) {
+        getGuestInstanceId(), requestId, 'default', '', function(allowed) {
       if (allowed) {
         return;
       }
       showWarningMessage(event.permission);
     });
     return;
   }
 
   var decisionMade = false;
   var validateCall = function() {
     if (decisionMade) {
       throw new Error(ERROR_MSG_PERMISSION_ALREADY_DECIDED);
     }
     decisionMade = true;
   };
 
   // Construct the event.request object.
   var request = {
     allow: function() {
       validateCall();
-      WebView.setPermission(getInstanceId(), requestId, 'allow');
+      WebView.setPermission(getGuestInstanceId(), requestId, 'allow');
     },
     deny: function() {
       validateCall();
-      WebView.setPermission(getInstanceId(), requestId, 'deny');
+      WebView.setPermission(getGuestInstanceId(), requestId, 'deny');
     }
   };
   webViewEvent.request = request;
 
   var defaultPrevented = !self.webViewInternal.dispatchEvent(webViewEvent);
   if (decisionMade) {
     return;
   }
 
   if (defaultPrevented) {
     // Make browser plugin track lifetime of |request|.
     MessagingNatives.BindToGC(request, function() {
       // Avoid showing a warning message if the decision has already been made.
       if (decisionMade) {
         return;
       }
       WebView.setPermission(
-          getInstanceId(), requestId, 'default', '', function(allowed) {
+          getGuestInstanceId(), requestId, 'default', '', function(allowed) {
         if (allowed) {
           return;
         }
         showWarningMessage(event.permission);
       });
     });
   } else {
     decisionMade = true;
     WebView.setPermission(
-        getInstanceId(), requestId, 'default', '', function(allowed) {
-      if (allowed) {
-        return;
-      }
-      showWarningMessage(event.permission);
-    });
+        getGuestInstanceId(), requestId, 'default', '',
+        function(allowed) {
+          if (allowed) {
+            return;
+          }
+          showWarningMessage(event.permission);
+        });
   }
 };
 
 WebViewEvents.prototype.handleSizeChangedEvent = function(
     event, webViewEvent) {
   this.webViewInternal.onSizeChanged(webViewEvent);
 };
 
 exports.WebViewEvents = WebViewEvents;
 exports.CreateEvent = CreateEvent;