Swapped the variable names "WebView" and "WebViewInternal" in web_view.js and other files that impo…

extensions/renderer/resources/guest_view/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.
+// Event management for WebView.
 
 var DeclarativeWebRequestSchema =
     requireNative('schema_registry').GetSchema('declarativeWebRequest');
 var EventBindings = require('event_bindings');
 var IdGenerator = requireNative('id_generator');
 var MessagingNatives = requireNative('messaging_natives');
 var WebRequestEvent = require('webRequestInternal').WebRequestEvent;
 var WebRequestSchema =
     requireNative('schema_registry').GetSchema('webRequest');
-var WebView = require('webViewInternal').WebView;
+var WebViewInternal = require('webViewInternal').WebViewInternal;
 
 var CreateEvent = function(name) {
   var eventOpts = {supportsListeners: true, supportsFilters: true};
   return new EventBindings.Event(name, undefined, eventOpts);
 };
 
 var FrameNameChangedEvent = CreateEvent('webViewInternal.onFrameNameChanged');
 var PluginDestroyedEvent = CreateEvent('webViewInternal.onPluginDestroyed');
 var WebRequestMessageEvent = CreateEvent('webViewInternal.onMessage');
 
@@ skipping 301 matching lines @@
   };
 
   var getGuestInstanceId = function() {
     return this.webViewInternal.getGuestInstanceId();
   }.bind(this);
 
   var dialog = {
     ok: function(user_input) {
       validateCall();
       user_input = user_input || '';
-      WebView.setPermission(getGuestInstanceId(), requestId, 'allow',
+      WebViewInternal.setPermission(getGuestInstanceId(), requestId, 'allow',
                             user_input);
     },
     cancel: function() {
       validateCall();
-      WebView.setPermission(getGuestInstanceId(), requestId, 'deny');
+      WebViewInternal.setPermission(getGuestInstanceId(), requestId, 'deny');
     }
   };
   webViewEvent.dialog = dialog;
 
   var defaultPrevented = !this.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(
+      WebViewInternal.setPermission(
           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(
+    WebViewInternal.setPermission(
         getGuestInstanceId(), requestId, 'default', '', function(allowed) {
       if (allowed) {
         return;
       }
       showWarningMessage(event.messageType);
     });
   }
 };
 
 WebViewEvents.prototype.handleLoadAbortEvent = function(event, webViewEvent) {
@@ skipping 69 matching lines @@
         if (!guestInstanceId) {
           // If the opener is already gone, then we won't have its
           // guestInstanceId.
           return;
         }
 
         // 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(
+        WebViewInternal.setPermission(
             guestInstanceId, requestId, attached ? 'allow' : 'deny');
       }, 0);
     },
     discard: function() {
       validateCall();
       var guestInstanceId = getGuestInstanceId();
       if (!guestInstanceId) {
         // If the opener is already gone, then we won't have its
         // guestInstanceId.
         return;
       }
-      WebView.setPermission(guestInstanceId, requestId, 'deny');
+      WebViewInternal.setPermission(guestInstanceId, requestId, 'deny');
     }
   };
   webViewEvent.window = windowObj;
 
   var defaultPrevented = !this.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;
       }
 
       var guestInstanceId = getGuestInstanceId();
       if (!guestInstanceId) {
         // If the opener is already gone, then we won't have its
         // guestInstanceId.
         return;
       }
 
-      WebView.setPermission(
+      WebViewInternal.setPermission(
           guestInstanceId, requestId, 'default', '', function(allowed) {
             if (allowed) {
               return;
             }
             showWarningMessage();
           });
     });
   } else {
     actionTaken = true;
     // The default action is to discard the window.
-    WebView.setPermission(
+    WebViewInternal.setPermission(
         getGuestInstanceId(), requestId, 'default', '', function(allowed) {
       if (allowed) {
         return;
       }
       showWarningMessage();
     });
   }
 };
 
 WebViewEvents.prototype.handlePermissionEvent =
     function(event, webViewEvent) {
   var ERROR_MSG_PERMISSION_ALREADY_DECIDED = '<webview>: ' +
       'Permission has already been decided for this "permissionrequest" event.';
 
   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 getGuestInstanceId = function() {
     return this.webViewInternal.getGuestInstanceId();
   }.bind(this);
 
   if (this.permissionTypes.indexOf(event.permission) < 0) {
     // The permission type is not allowed. Trigger the default response.
-    WebView.setPermission(
+    WebViewInternal.setPermission(
         getGuestInstanceId(), requestId, 'default', '', function(allowed) {
       if (!allowed)
         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(getGuestInstanceId(), requestId, 'allow');
+      WebViewInternal.setPermission(getGuestInstanceId(), requestId, 'allow');
     },
     deny: function() {
       validateCall();
-      WebView.setPermission(getGuestInstanceId(), requestId, 'deny');
+      WebViewInternal.setPermission(getGuestInstanceId(), requestId, 'deny');
     }
   };
   webViewEvent.request = request;
 
   var defaultPrevented = !this.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(
+      WebViewInternal.setPermission(
           getGuestInstanceId(), requestId, 'default', '', function(allowed) {
         if (allowed) {
           return;
         }
         showWarningMessage(event.permission);
       });
     });
   } else {
     decisionMade = true;
-    WebView.setPermission(
+    WebViewInternal.setPermission(
         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;