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

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

 // Copyright 2015 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/settings/settings_startup_pages_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "components/url_formatter/url_fixer.h"
 #include "content/public/browser/web_ui.h"
 
 namespace settings {
 
 StartupPagesHandler::StartupPagesHandler(content::WebUI* webui)
     : startup_custom_pages_table_model_(Profile::FromWebUI(webui)) {
 }
 
 StartupPagesHandler::~StartupPagesHandler() {
 }
 
 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)));
   web_ui()->RegisterMessageCallback("onStartupPrefsPageLoad",
       base::Bind(&StartupPagesHandler::OnStartupPrefsPageLoad,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("removeStartupPage",
       base::Bind(&StartupPagesHandler::RemoveStartupPage,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("setStartupPagesToCurrentPages",
@@ skipping 47 matching lines @@
   int row_count = startup_custom_pages_table_model_.RowCount();
   int index;
   if (!args->GetInteger(1, &index) || index > row_count)
     index = row_count;
 
   startup_custom_pages_table_model_.Add(index, url);
   SaveStartupPagesPref();
 }
 
 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);
 }
 
 void StartupPagesHandler::RemoveStartupPage(const base::ListValue* args) {
   int selected_index;
   if (!args->GetInteger(0, &selected_index)) {
     DLOG(ERROR) << "Missing index parameter";
     return;
@@ skipping 29 matching lines @@
 
 void StartupPagesHandler::UpdateStartupPages() {
   const SessionStartupPref startup_pref = SessionStartupPref::GetStartupPref(
       Profile::FromWebUI(web_ui())->GetPrefs());
   startup_custom_pages_table_model_.SetURLs(startup_pref.urls);
   // The change will go to the JS code in the
   // StartupPagesHandler::OnModelChanged() method.
 }
 
 }  // namespace settings