Make miscellaneous_bindings and event_bindings Required as needed. Previously

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 appWindowNatives = requireNative('app_window_natives');
 var Binding = require('binding').Binding;
 var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
 var chrome = requireNative('chrome').GetChrome();
+var Event = require('event_bindings').Event;
+var forEach = require('utils').forEach;
 var sendRequest = require('sendRequest').sendRequest;
-var appWindowNatives = requireNative('app_window');
-var forEach = require('utils').forEach;
-var GetView = appWindowNatives.GetView;
-var OnContextReady = appWindowNatives.OnContextReady;
 
 var appWindow = Binding.create('app.window');
 appWindow.registerCustomHook(function(bindingsAPI) {
   var apiFunctions = bindingsAPI.apiFunctions;
 
   apiFunctions.setCustomCallback('create',
                                  function(name, request, windowParams) {
     var view = null;
-    if (windowParams.viewId)
-      view = GetView(windowParams.viewId, windowParams.injectTitlebar);
+    if (windowParams.viewId) {
+      view = appWindowNatives.GetView(
+          windowParams.viewId, windowParams.injectTitlebar);
+    }
 
     if (!view) {
       // No route to created window. If given a callback, trigger it with an
       // undefined object.
       if (request.callback) {
         request.callback();
         delete request.callback;
       }
       return;
     }
@@ skipping 12 matching lines @@
     view.chrome.app.window.initializeAppWindow(windowParams);
 
     var callback = request.callback;
     if (callback) {
       delete request.callback;
       if (!view) {
         callback(undefined);
         return;
       }
 
-      var willCallback = OnContextReady(windowParams.viewId, function(success) {
+      var willCallback = appWindowNatives.OnContextReady(windowParams.viewId,
+                                                         function(success) {
         if (success) {
           callback(view.chrome.app.window.current());
         } else {
           callback(undefined);
         }
       });
       if (!willCallback) {
         callback(undefined);
       }
     }
   });
 
   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];
     });
     AppWindow.prototype.moveTo = window.moveTo.bind(window);
     AppWindow.prototype.resizeTo = window.resizeTo.bind(window);
     AppWindow.prototype.contentWindow = window;
-    AppWindow.prototype.onClosed = new chrome.Event;
+    AppWindow.prototype.onClosed = new Event();
     AppWindow.prototype.close = function() {
       this.contentWindow.close();
     };
     AppWindow.prototype.getBounds = function() {
       var bounds = chromeHidden.appWindowData.bounds;
       return { left: bounds.left, top: bounds.top,
                width: bounds.width, height: bounds.height };
     };
     AppWindow.prototype.isFullscreen = function() {
       return chromeHidden.appWindowData.fullscreen;
@@ skipping 21 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();
 };
 
+// Called by c/r/e/extension_helper.cc.
+function onAppWindowClosed() {
+  if (!chromeHidden.currentAppWindow)
+    return;
+  chromeHidden.currentAppWindow.onClosed.dispatch();
+}
+
 exports.binding = appWindow.generate();
+exports.onAppWindowClosed = onAppWindowClosed;
+exports.updateAppWindowProperties = updateAppWindowProperties;