[webui settings] send user profiles info earlier during load

chrome/browser/ui/webui/options2/browser_options_handler2.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/options2/browser_options_handler2.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 373 matching lines @@
       static_cast<chromeos::options2::SystemSettingsProvider*>(
           chromeos::CrosSettings::Get()->GetProvider(
               chromeos::kSystemTimezone))->GetTimezoneList());
 #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 (multiprofile_)
+    values->Set("profilesInfo", GetProfilesInfoList());
 }
 
 void BrowserOptionsHandler::RegisterCloudPrintValues(DictionaryValue* values) {
 #if defined(OS_CHROMEOS)
   values->SetString("cloudPrintChromeosOptionLabel",
       l10n_util::GetStringFUTF16(
       IDS_CLOUD_PRINT_CHROMEOS_OPTION_LABEL,
       l10n_util::GetStringUTF16(IDS_GOOGLE_CLOUD_PRINT)));
   values->SetString("cloudPrintChromeosOptionButton",
       l10n_util::GetStringFUTF16(
@@ skipping 199 matching lines @@
 #if !defined(OS_CHROMEOS)
   proxy_prefs_.reset(
       PrefSetObserver::CreateProxyPrefSetObserver(prefs, this));
 #endif  // !defined(OS_CHROMEOS)
 }
 
 void BrowserOptionsHandler::InitializePage() {
   OnTemplateURLServiceChanged();
   ObserveThemeChanged();
 
-  if (multiprofile_)
-    SendProfilesInfo();
-
   SetupMetricsReportingCheckbox();
   SetupMetricsReportingSettingVisibility();
   SetupFontSizeSelector();
   SetupPageZoomSelector();
   SetupAutoOpenFileTypes();
   SetupProxySettingsSection();
   SetupSSLConfigSettings();
 #if !defined(OS_CHROMEOS)
   if (cloud_print_connector_ui_enabled_) {
     SetupCloudPrintConnectorSection();
@@ skipping 268 matching lines @@
 
 void BrowserOptionsHandler::GetInstantFieldTrialStatus(const ListValue* args) {
   Profile* profile = Profile::FromWebUI(web_ui());
   base::FundamentalValue enabled(
       InstantFieldTrial::IsInstantExperiment(profile) &&
       !InstantFieldTrial::IsHiddenExperiment(profile));
   web_ui()->CallJavascriptFunction("BrowserOptions.setInstantFieldTrialStatus",
                                    enabled);
 }
 
-void BrowserOptionsHandler::SendProfilesInfo() {
-  // Set profile creation text and button if multi-profiles switch is on.
-  scoped_ptr<Value> visible(Value::CreateBooleanValue(multiprofile_));
-  web_ui()->CallJavascriptFunction("BrowserOptions.setProfilesSectionVisible",
-                                   *visible);
-
-  if (!multiprofile_)
-    return;
-
+ListValue* BrowserOptionsHandler::GetProfilesInfoList() {
   ProfileInfoCache& cache =
       g_browser_process->profile_manager()->GetProfileInfoCache();
-  ListValue profile_info_list;
+  ListValue* profile_info_list = new ListValue;

[sail, 2012/04/23 15:44:53]

Maybe make this a scoped_ptr and do a release at the bottom? Even better, could
this function just return a scoped_ptr? That way you can get rid of the comment
about caller taking ownership.

[Evan Stade, 2012/04/23 20:19:02]

that would delete the object

[Evan Stade, 2012/04/23 21:55:47]

Done.

   FilePath current_profile_path =
       web_ui()->GetWebContents()->GetBrowserContext()->GetPath();
+
   for (size_t i = 0, e = cache.GetNumberOfProfiles(); i < e; ++i) {
     DictionaryValue* profile_value = new DictionaryValue();
     FilePath profile_path = cache.GetPathOfProfileAtIndex(i);
     profile_value->SetString("name", cache.GetNameOfProfileAtIndex(i));
     profile_value->Set("filePath", base::CreateFilePathValue(profile_path));
     profile_value->SetBoolean("isCurrentProfile",
                               profile_path == current_profile_path);
 
     bool is_gaia_picture =
         cache.IsUsingGAIAPictureOfProfileAtIndex(i) &&
         cache.GetGAIAPictureOfProfileAtIndex(i);
     if (is_gaia_picture) {
       gfx::Image icon = profiles::GetAvatarIconForWebUI(
           cache.GetAvatarIconOfProfileAtIndex(i), true);
       profile_value->SetString("iconURL",
           web_ui_util::GetImageDataUrl(*icon.ToSkBitmap()));
     } else {
       size_t icon_index = cache.GetAvatarIconIndexOfProfileAtIndex(i);
       profile_value->SetString("iconURL",
                                cache.GetDefaultAvatarIconUrl(icon_index));
     }
 
-    profile_info_list.Append(profile_value);
+    profile_info_list->Append(profile_value);
   }
 
+  return profile_info_list;
+}
+
+void BrowserOptionsHandler::SendProfilesInfo() {
+  scoped_ptr<ListValue> profile_info_list(GetProfilesInfoList());
   web_ui()->CallJavascriptFunction("BrowserOptions.setProfilesInfo",
-                                   profile_info_list);
+                                   *profile_info_list);
 }
 
 void BrowserOptionsHandler::CreateProfile(const ListValue* args) {
   // This handler could have been called in managed mode, for example because
   // the user fiddled with the web inspector. Silently return in this case.
   if (!ProfileManager::IsMultipleProfilesEnabled())
     return;
   ProfileManager::CreateMultiProfileAsync();
 }
 
@@ skipping 457 matching lines @@
 }
 
 void BrowserOptionsHandler::SetupSSLConfigSettings() {
   base::FundamentalValue checked(rev_checking_enabled_.GetValue());
   base::FundamentalValue disabled(rev_checking_enabled_.IsManaged());
   web_ui()->CallJavascriptFunction(
       "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled);
 }
 
 }  // namespace options2