[uber page] Split up initialization of handlers from initialization of webui pages

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

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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/search_engine_manager_handler2.h"
 
 #include "base/bind.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 22 matching lines @@
 namespace options2 {
 
 SearchEngineManagerHandler::SearchEngineManagerHandler() {
 }
 
 SearchEngineManagerHandler::~SearchEngineManagerHandler() {
   if (list_controller_.get() && list_controller_->table_model())
     list_controller_->table_model()->SetObserver(NULL);
 }
 
-void SearchEngineManagerHandler::Initialize() {
+void SearchEngineManagerHandler::InitializeHandler() {
   list_controller_.reset(
       new KeywordEditorController(Profile::FromWebUI(web_ui())));
-  if (list_controller_.get()) {
-    list_controller_->table_model()->SetObserver(this);
-    OnModelChanged();
-  }
+  DCHECK(list_controller_.get());
+  list_controller_->table_model()->SetObserver(this);
+}
+
+void SearchEngineManagerHandler::InitializePage() {
+  OnModelChanged();
 }
 
 void SearchEngineManagerHandler::GetLocalizedValues(
     base::DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
 
   RegisterTitle(localized_strings, "searchEngineManagerPage",
                 IDS_SEARCH_ENGINES_EDITOR_WINDOW_TITLE);
   localized_strings->SetString("defaultSearchEngineListTitle",
       l10n_util::GetStringUTF16(IDS_SEARCH_ENGINES_EDITOR_MAIN_SEPARATOR));
@@ skipping 47 matching lines @@
       "searchEngineEditCancelled",
       base::Bind(&SearchEngineManagerHandler::EditCancelled,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
       "searchEngineEditCompleted",
       base::Bind(&SearchEngineManagerHandler::EditCompleted,
                  base::Unretained(this)));
 }
 
 void SearchEngineManagerHandler::OnModelChanged() {
+  DCHECK(list_controller_.get());
   if (!list_controller_->loaded())
     return;
 
   // Find the default engine.
   const TemplateURL* default_engine =
       list_controller_->url_model()->GetDefaultSearchProvider();
   int default_index = list_controller_->table_model()->IndexOfTemplateURL(
       default_engine);
 
   // Build the first list (default search engine options).
@@ skipping 181 matching lines @@
   if (!args->GetString(ENGINE_NAME, &name) ||
       !args->GetString(ENGINE_KEYWORD, &keyword) ||
       !args->GetString(ENGINE_URL, &url)) {
     NOTREACHED();
     return;
   }
   edit_controller_->AcceptAddOrEdit(name, keyword, url);
 }
 
 }  // namespace options2