Separate handler initialization from page initialization

chrome/browser/resources/options2/options_page.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.
 
 cr.define('options', function() {
   /////////////////////////////////////////////////////////////////////////////
   // OptionsPage class:
 
   /**
    * Base class for options page.
@@ skipping 521 matching lines @@
     var topPage = OptionsPage.getTopmostVisiblePage();
     if (topPage)
       this.setRootPageFrozen_(topPage.isOverlay);
   };
 
   /**
    * Initializes the complete options page.  This will cause all C++ handlers to
    * be invoked to do final setup.
    */
   OptionsPage.initialize = function() {
-    chrome.send('coreOptionsInitialize');
-    this.initialized_ = true;
+    chrome.send('coreOptionsInitializePages');
     uber.onContentFrameLoaded();
 
     this.fixedHeaders_ = document.querySelectorAll('header');
 
     document.addEventListener('scroll', this.handleScroll_.bind(this));
 
     // Trigger the scroll handler manually to set the initial state.
     this.handleScroll_();
 
     // Shake the dialog if the user clicks outside the dialog bounds.
@@ skipping 75 matching lines @@
     }
   };
 
   /**
    * Re-initializes the C++ handlers if necessary. This is called if the
    * handlers are torn down and recreated but the DOM may not have been (in
    * which case |initialize| won't be called again). If |initialize| hasn't been
    * called, this does nothing (since it will be later, once the DOM has
    * finished loading).
    */
   OptionsPage.reinitializeCore = function() {

[Dan Beam, 2012/04/05 21:38:21]

And if we remove that other stuff, we can probably remove this as well. We could
probably already remove this.initialized_ unless we're using it anywhere else as
the C++ already keeps this info.

-    if (!this.initialized_)
-      chrome.send('coreOptionsInitialize');
+    if (!this.initialized_) {
+      chrome.send('coreOptionsInitializeHandlers');
+      this.initialized_ = true;
+    }
   };
 
   OptionsPage.prototype = {
     __proto__: cr.EventTarget.prototype,
 
     /**
      * The parent page of this option page, or null for top-level pages.
      * @type {OptionsPage}
      */
     parentPage: null,
@@ skipping 237 matching lines @@
     canShowPage: function() {
       return true;
     },
   };
 
   // Export
   return {
     OptionsPage: OptionsPage
   };
 });