Index: chrome/browser/ui/webui/options2/search_engine_manager_handler2.cc |
diff --git a/chrome/browser/ui/webui/options2/search_engine_manager_handler2.cc b/chrome/browser/ui/webui/options2/search_engine_manager_handler2.cc |
index 999269a67d43d6d739d500db386468cb770e8335..09c6336f90167342f8b7d7e0204e27d452d5c299 100644 |
--- a/chrome/browser/ui/webui/options2/search_engine_manager_handler2.cc |
+++ b/chrome/browser/ui/webui/options2/search_engine_manager_handler2.cc |
@@ -41,13 +41,15 @@ SearchEngineManagerHandler::~SearchEngineManagerHandler() { |
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( |
@@ -115,6 +117,7 @@ void SearchEngineManagerHandler::RegisterMessages() { |
} |
void SearchEngineManagerHandler::OnModelChanged() { |
+ DCHECK(list_controller_.get()); |
if (!list_controller_->loaded()) |
return; |