DOMUI prefs: Fix a race condition in pushing search engine information to DOMUI

BUG=None
TEST=Load DOMUI options, go to another page, load DOMUI options again, and manage search engines; the table should not be empty.

Review URL: http://codereview.chromium.org/3116023

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57077 0039d316-1c4b-4281-b951-d872f2087c98
parent b7304169
...@@ -26,7 +26,10 @@ SearchEngineManagerHandler::~SearchEngineManagerHandler() { ...@@ -26,7 +26,10 @@ SearchEngineManagerHandler::~SearchEngineManagerHandler() {
void SearchEngineManagerHandler::Initialize() { void SearchEngineManagerHandler::Initialize() {
controller_.reset(new KeywordEditorController(dom_ui_->GetProfile())); controller_.reset(new KeywordEditorController(dom_ui_->GetProfile()));
controller_->table_model()->SetObserver(this); if (controller_.get()) {
controller_->table_model()->SetObserver(this);
OnModelChanged();
}
} }
void SearchEngineManagerHandler::GetLocalizedValues( void SearchEngineManagerHandler::GetLocalizedValues(
...@@ -59,6 +62,9 @@ void SearchEngineManagerHandler::RegisterMessages() { ...@@ -59,6 +62,9 @@ void SearchEngineManagerHandler::RegisterMessages() {
} }
void SearchEngineManagerHandler::OnModelChanged() { void SearchEngineManagerHandler::OnModelChanged() {
if (!controller_->loaded())
return;
ListValue engine_list; ListValue engine_list;
// Find the default engine. // Find the default engine.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment