Make ExtensionMsg_MessageInvoke run a module system function rather than a

chrome/renderer/resources/extensions/app_window_custom_bindings.js

 // Copyright (c) 2012 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.
 
 // Custom binding for the app_window API.
 
 var Binding = require('binding').Binding;
 var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
 var chrome = requireNative('chrome').GetChrome();
 var sendRequest = require('sendRequest').sendRequest;
@@ skipping 58 matching lines @@
 
   apiFunctions.setHandleRequest('current', function() {
     if (!chromeHidden.currentAppWindow) {
       console.error('chrome.app.window.current() is null -- window not ' +
                     'created with chrome.app.window.create()');
       return null;
     }
     return chromeHidden.currentAppWindow;
   });
 
-  chromeHidden.OnAppWindowClosed = function() {
-    if (!chromeHidden.currentAppWindow)
-      return;
-    chromeHidden.currentAppWindow.onClosed.dispatch();
-  };
-
   // This is an internal function, but needs to be bound with setHandleRequest
   // because it is called from a different JS context.
   apiFunctions.setHandleRequest('initializeAppWindow', function(params) {
     var currentWindowInternal =
         Binding.create('app.currentWindowInternal').generate();
     var AppWindow = function() {};
     forEach(currentWindowInternal, function(fn) {
       AppWindow.prototype[fn] =
           currentWindowInternal[fn];
     });
@@ skipping 35 matching lines @@
   });
 });
 
 function boundsEqual(bounds1, bounds2) {
   if (!bounds1 || !bounds2)
     return false;
   return (bounds1.left == bounds2.left && bounds1.top == bounds2.top &&
           bounds1.width == bounds2.width && bounds1.height == bounds2.height);
 }
 
-chromeHidden.updateAppWindowProperties = function(update) {
+function updateAppWindowProperties(update) {
   if (!chromeHidden.appWindowData)
     return;
   var oldData = chromeHidden.appWindowData;
   update.id = oldData.id;
   chromeHidden.appWindowData = update;
 
   var currentWindow = chromeHidden.currentAppWindow;
 
   if (!boundsEqual(oldData.bounds, update.bounds))
     currentWindow["onBoundsChanged"].dispatch();
 
   if (!oldData.fullscreen && update.fullscreen)
     currentWindow["onFullscreened"].dispatch();
   if (!oldData.minimized && update.minimized)
     currentWindow["onMinimized"].dispatch();
   if (!oldData.maximized && update.maximized)
     currentWindow["onMaximized"].dispatch();
 
   if ((oldData.fullscreen && !update.fullscreen) ||
       (oldData.minimized && !update.minimized) ||
       (oldData.maximized && !update.maximized))
     currentWindow["onRestored"].dispatch();
 };
 
+function onAppWindowClosed() {
+  if (!chromeHidden.currentAppWindow)
+    return;
+  chromeHidden.currentAppWindow.onClosed.dispatch();
+}
+
 exports.binding = appWindow.generate();
+exports.onAppWindowClosed = onAppWindowClosed;
+exports.updateAppWindowProperties = updateAppWindowProperties;