Separate handler initialization from page initialization

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

Index: chrome/browser/ui/webui/options2/core_options_handler2.cc
diff --git a/chrome/browser/ui/webui/options2/core_options_handler2.cc b/chrome/browser/ui/webui/options2/core_options_handler2.cc
index 226756b116d71471e2b5a503b0fe5d84c40db1de..d5902ddfe32c17955d23e392f0fba046add4cd73 100644
--- a/chrome/browser/ui/webui/options2/core_options_handler2.cc
+++ b/chrome/browser/ui/webui/options2/core_options_handler2.cc
@@ -134,8 +134,11 @@ void CoreOptionsHandler::Observe(int type,
 void CoreOptionsHandler::RegisterMessages() {
   registrar_.Init(Profile::FromWebUI(web_ui())->GetPrefs());
 
-  web_ui()->RegisterMessageCallback("coreOptionsInitialize",
-      base::Bind(&CoreOptionsHandler::HandleInitialize,
+  web_ui()->RegisterMessageCallback("coreOptionsInitializeHandlers",
+      base::Bind(&CoreOptionsHandler::HandleInitializeHandlers,
+                 base::Unretained(this)));
+  web_ui()->RegisterMessageCallback("coreOptionsInitializePages",
+      base::Bind(&CoreOptionsHandler::HandleInitializePages,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("fetchPrefs",
       base::Bind(&CoreOptionsHandler::HandleFetchPrefs,
@@ -169,11 +172,16 @@ void CoreOptionsHandler::RegisterMessages() {
                  base::Unretained(this)));
 }
 
-void CoreOptionsHandler::HandleInitialize(const ListValue* args) {
+void CoreOptionsHandler::HandleInitializeHandlers(const ListValue* args) {
   DCHECK(handlers_host_);
   handlers_host_->InitializeHandlers();
 }
 
+void CoreOptionsHandler::HandleInitializePages(const ListValue* args) {
+  DCHECK(handlers_host_);
+  handlers_host_->InitializePages();
+}
+
 base::Value* CoreOptionsHandler::FetchPref(const std::string& pref_name) {
   PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs();