[MD settings] delay SetObserver in StartupUrl settings until page is loaded

chrome/browser/ui/webui/settings/settings_startup_pages_handler.cc

Index: chrome/browser/ui/webui/settings/settings_startup_pages_handler.cc
diff --git a/chrome/browser/ui/webui/settings/settings_startup_pages_handler.cc b/chrome/browser/ui/webui/settings/settings_startup_pages_handler.cc
index e9b7be0940379515db33db302917385c61039bc9..aaf27b70b2eb08ab3790e5dbf68ed4233b0f1ed6 100644
--- a/chrome/browser/ui/webui/settings/settings_startup_pages_handler.cc
+++ b/chrome/browser/ui/webui/settings/settings_startup_pages_handler.cc
@@ -26,22 +26,6 @@ void StartupPagesHandler::RegisterMessages() {
   if (Profile::FromWebUI(web_ui())->IsOffTheRecord())
     return;
 
-  startup_custom_pages_table_model_.SetObserver(this);
-
-  PrefService* prefService = Profile::FromWebUI(web_ui())->GetPrefs();
-  SessionStartupPref pref = SessionStartupPref::GetStartupPref(
-      prefService);
-  startup_custom_pages_table_model_.SetURLs(pref.urls);
-
-  if (pref.urls.empty())
-    pref.type = SessionStartupPref::DEFAULT;
-
-  pref_change_registrar_.Init(prefService);
-  pref_change_registrar_.Add(
-      prefs::kURLsToRestoreOnStartup,
-      base::Bind(&StartupPagesHandler::UpdateStartupPages,
-                 base::Unretained(this)));
-
   web_ui()->RegisterMessageCallback("addStartupPage",
       base::Bind(&StartupPagesHandler::AddStartupPage,
                  base::Unretained(this)));
@@ -109,6 +93,21 @@ void StartupPagesHandler::AddStartupPage(const base::ListValue* args) {
 }
 
 void StartupPagesHandler::OnStartupPrefsPageLoad(const base::ListValue* args) {
+  startup_custom_pages_table_model_.SetObserver(this);
+
+  PrefService* prefService = Profile::FromWebUI(web_ui())->GetPrefs();
+  SessionStartupPref pref = SessionStartupPref::GetStartupPref(
+      prefService);
+  startup_custom_pages_table_model_.SetURLs(pref.urls);
+
+  if (pref.urls.empty())
+    pref.type = SessionStartupPref::DEFAULT;
+
+  pref_change_registrar_.Init(prefService);
+  pref_change_registrar_.Add(
+      prefs::kURLsToRestoreOnStartup,
+      base::Bind(&StartupPagesHandler::UpdateStartupPages,
+                 base::Unretained(this)));

[Dan Beam, 2016/01/26 23:34:27]

nit: \n

[dschuyler, 2016/01/26 23:40:16]

Done.

   const SessionStartupPref startup_pref = SessionStartupPref::GetStartupPref(
       Profile::FromWebUI(web_ui())->GetPrefs());
   startup_custom_pages_table_model_.SetURLs(startup_pref.urls);