Separate handler initialization from page initialization

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

 // 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.
 
 #include "chrome/browser/ui/webui/options2/core_options_handler2.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/json/json_reader.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 116 matching lines @@
       UpdateClearPluginLSOData();
       return;
     }
     NotifyPrefChanged(*pref_name, std::string());
   }
 }
 
 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,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("observePrefs",
       base::Bind(&CoreOptionsHandler::HandleObservePrefs,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("setBooleanPref",
       base::Bind(&CoreOptionsHandler::HandleSetBooleanPref,
                  base::Unretained(this)));
@@ skipping 13 matching lines @@
       base::Bind(&CoreOptionsHandler::HandleSetListPref,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("clearPref",
       base::Bind(&CoreOptionsHandler::HandleClearPref,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("coreOptionsUserMetricsAction",
       base::Bind(&CoreOptionsHandler::HandleUserMetricsAction,
                  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();
 
   const PrefService::Preference* pref =
       pref_service->FindPreference(pref_name.c_str());
   if (!pref)
     return base::Value::CreateNullValue();
 
   return CreateValueForPref(pref, NULL);
 }
@@ skipping 270 matching lines @@
 
 void CoreOptionsHandler::UpdateClearPluginLSOData() {
   scoped_ptr<base::Value> enabled(
       base::Value::CreateBooleanValue(
           clear_plugin_lso_data_enabled_.GetValue()));
   web_ui()->CallJavascriptFunction(
       "OptionsPage.setClearPluginLSODataEnabled", *enabled);
 }
 
 }  // namespace options2