Request profiles info in BrowserOptions.initializePage to populate the profiles list

chrome/browser/ui/webui/options/browser_options_handler.cc

 // 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/options/browser_options_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 496 matching lines @@
   values->SetBoolean("enableStickyKeys",
                      !command_line.HasSwitch(switches::kDisableStickyKeys));
 #endif
 
 #if defined(OS_MACOSX)
   values->SetString("macPasswordsWarning",
       l10n_util::GetStringUTF16(IDS_OPTIONS_PASSWORDS_MAC_WARNING));
   values->SetBoolean("multiple_profiles",
       g_browser_process->profile_manager()->GetNumberOfProfiles() > 1);
 #endif
-
-  if (ShouldShowMultiProfilesUserList(GetDesktopType()))
-    values->Set("profilesInfo", GetProfilesInfoList().release());
+  values->SetBoolean("showProfilesSection",
+                     ShouldShowMultiProfilesUserList(GetDesktopType()));
 
   values->SetBoolean("profileIsManaged",
                      Profile::FromWebUI(web_ui())->IsManaged());
 
 #if !defined(OS_CHROMEOS)
   values->SetBoolean(
       "gpuEnabledAtStart",
       g_browser_process->gpu_mode_manager()->initial_gpu_mode_pref());
 #endif
 
@@ skipping 48 matching lines @@
       base::Bind(&BrowserOptionsHandler::DeleteProfile,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
       "cancelCreateProfile",
       base::Bind(&BrowserOptionsHandler::HandleCancelProfileCreation,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
       "themesReset",
       base::Bind(&BrowserOptionsHandler::ThemesReset,
                  base::Unretained(this)));
+  web_ui()->RegisterMessageCallback(
+      "requestProfilesInfo",
+      base::Bind(&BrowserOptionsHandler::RequestProfilesInfo,
+                 base::Unretained(this)));
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
   web_ui()->RegisterMessageCallback(
       "themesSetNative",
       base::Bind(&BrowserOptionsHandler::ThemesSetNative,
                  base::Unretained(this)));
 #endif
   web_ui()->RegisterMessageCallback(
       "selectDownloadLocation",
       base::Bind(&BrowserOptionsHandler::HandleSelectDownloadLocation,
                  base::Unretained(this)));
@@ skipping 879 matching lines @@
   double zoom_factor;
   if (ExtractDoubleValue(args, &zoom_factor)) {
     default_zoom_level_.SetValue(content::ZoomFactorToZoomLevel(zoom_factor));
   }
 }
 
 void BrowserOptionsHandler::HandleRestartBrowser(const ListValue* args) {
   chrome::AttemptRestart();
 }
 
+void BrowserOptionsHandler::RequestProfilesInfo(const ListValue* args) {
+  SendProfilesInfo();
+}
+
 #if !defined(OS_CHROMEOS)
 void BrowserOptionsHandler::ShowNetworkProxySettings(const ListValue* args) {
   content::RecordAction(UserMetricsAction("Options_ShowProxySettings"));
   AdvancedOptionsUtilities::ShowNetworkProxySettings(
       web_ui()->GetWebContents());
 }
 #endif
 
 #if !defined(USE_NSS) && !defined(USE_OPENSSL)
 void BrowserOptionsHandler::ShowManageSSLCertificates(const ListValue* args) {
@@ skipping 262 matching lines @@
   const ProfileInfoCache& cache =
       g_browser_process->profile_manager()->GetProfileInfoCache();
   for (size_t i = 0; i < cache.GetNumberOfProfiles(); ++i) {
     if (existing_managed_user_id == cache.GetManagedUserIdOfProfileAtIndex(i))
       return false;
   }
   return true;
 }
 
 }  // namespace options