Separate handler initialization from page initialization

chrome/browser/ui/webui/options2/core_options_handler2.h

Index: chrome/browser/ui/webui/options2/core_options_handler2.h
diff --git a/chrome/browser/ui/webui/options2/core_options_handler2.h b/chrome/browser/ui/webui/options2/core_options_handler2.h
index 8849a6ab77ec3d0f88f162597fd4fb69cd2ddc08..257b3c22d808116e0f09e6c456a311e646ca0157 100644
--- a/chrome/browser/ui/webui/options2/core_options_handler2.h
+++ b/chrome/browser/ui/webui/options2/core_options_handler2.h
@@ -98,10 +98,16 @@ class CoreOptionsHandler : public OptionsPageUIHandler {
     TYPE_LIST,
   };
 
-  // Callback for the "coreOptionsInitialize" message.  This message will
-  // trigger the Initialize() method of all other handlers so that final
-  // setup can be performed before the page is shown.
-  void HandleInitialize(const ListValue* args);
+  // Callback for the "coreOptionsInitializeHandlers" message. This calls the
+  // InitializeHandler() method of all other handlers so that final setup can
+  // be performed before the page is shown.
+  void HandleInitializeHandlers(const ListValue* args);
+
+  // Callback for the "coreOptionsInitializePages" message. This calls the
+  // InitializePage() method of all other handlers, to pass data back to the
+  // JavaScript on the page so it can populate the UI. This is called *after*
+  // HandleInitializeHandlers.
+  void HandleInitializePages(const ListValue* args);
 
   // Callback for the "fetchPrefs" message. This message accepts the list of
   // preference names passed as the |args| parameter (ListValue). It passes