Settings People Revamp: Implement Chrome Profile name/icon selection.

chrome/browser/ui/webui/settings/people_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/people_handler.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ skipping 197 matching lines @@
   profile_pref_registrar_.Init(prefs);
   profile_pref_registrar_.Add(
       prefs::kSigninAllowed,
       base::Bind(&PeopleHandler::OnSigninAllowedPrefChange,
                  base::Unretained(this)));
 
   ProfileSyncService* sync_service(
       ProfileSyncServiceFactory::GetInstance()->GetForProfile(profile_));
   if (sync_service)
     sync_service_observer_.Add(sync_service);
+
+  g_browser_process->profile_manager()->GetProfileInfoCache().AddObserver(this);
 }
 
 PeopleHandler::~PeopleHandler() {
   // Just exit if running unit tests (no actual WebUI is attached).
   if (!web_ui())
     return;
 
   // This case is hit when the user performs a back navigation.
   CloseSyncSetup();
+
+  g_browser_process->profile_manager()->
+      GetProfileInfoCache().RemoveObserver(this);
 }
 
 void PeopleHandler::ConfigureSyncDone() {
   base::StringValue page("done");
   web_ui()->CallJavascriptFunction("settings.SyncPrivateApi.showSyncSetupPage",
                                    page);
 
   // Suppress the sign in promo once the user starts sync. This way the user
   // doesn't see the sign in promo even if they sign out later on.
   signin::SetUserSkippedPromo(profile_);
@@ skipping 14 matching lines @@
 
 bool PeopleHandler::IsActiveLogin() const {
   // LoginUIService can be nullptr if page is brought up in incognito mode
   // (i.e. if the user is running in guest mode in cros and brings up settings).
   LoginUIService* service = GetLoginUIService();
   return service && (service->current_login_ui() == this);
 }
 
 void PeopleHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback(
+      "GetProfileInfo",
+      base::Bind(&PeopleHandler::HandleGetProfileInfo, base::Unretained(this)));
+  web_ui()->RegisterMessageCallback(
       "SyncSetupDidClosePage",
       base::Bind(&PeopleHandler::OnDidClosePage, base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
       "SyncSetupConfigure",
       base::Bind(&PeopleHandler::HandleConfigure, base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
       "SyncSetupShowSetupUI",
       base::Bind(&PeopleHandler::HandleShowSetupUI, base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
       "SyncSetupCloseTimeout",
@@ skipping 152 matching lines @@
 
   DisplayConfigureSync(false);
 }
 
 ProfileSyncService* PeopleHandler::GetSyncService() const {
   return profile_->IsSyncAllowed()
              ? ProfileSyncServiceFactory::GetForProfile(profile_)
              : nullptr;
 }
 
+void PeopleHandler::HandleGetProfileInfo(const base::ListValue* args) {
+  std::string name;
+  std::string icon_url;
+  GetAccountNameAndIcon(*profile_, &name, &icon_url);
+
+  web_ui()->CallJavascriptFunction("settings.SyncPrivateApi.receiveProfileInfo",
+                                   base::StringValue(name),
+                                   base::StringValue(icon_url));
+}
+
 void PeopleHandler::HandleConfigure(const base::ListValue* args) {
   DCHECK(!sync_startup_tracker_);
   std::string json;
   if (!args->GetString(0, &json)) {
     NOTREACHED() << "Could not read JSON argument";
     return;
   }
   if (json.empty()) {
     NOTREACHED();
     return;
@@ skipping 315 matching lines @@
 
 void PeopleHandler::GoogleSignedOut(const std::string& /* account_id */,
                                     const std::string& /* username */) {
   UpdateSyncState();
 }
 
 void PeopleHandler::OnStateChanged() {
   UpdateSyncState();
 }
 
+void PeopleHandler::OnProfileNameChanged(
+    const base::FilePath& profile_path,
+    const base::string16& old_profile_name) {

[dschuyler, 2015/12/22 18:47:48]

comment out unused params

[tommycli, 2015/12/22 21:58:33]

Done.

+  HandleGetProfileInfo(nullptr);
+}
+
+void PeopleHandler::OnProfileAvatarChanged(
+    const base::FilePath& profile_path) {

[dschuyler, 2015/12/22 18:47:48]

comment out unused param name.

[tommycli, 2015/12/22 21:58:33]

Done.

+  HandleGetProfileInfo(nullptr);
+}
+
 scoped_ptr<base::DictionaryValue> PeopleHandler::GetSyncStateDictionary() {
   // The items which are to be written into |sync_status| are also described in
   // chrome/browser/resources/options/browser_options.js in @typedef
   // for SyncStatus. Please update it whenever you add or remove any keys here.
   scoped_ptr<base::DictionaryValue> sync_status(new base::DictionaryValue);
   if (profile_->IsGuestSession()) {
     // Cannot display signin status when running in guest mode on chromeos
     // because there is no SigninManager.
     sync_status->SetBoolean("signinAllowed", false);
     return sync_status.Pass();
@@ skipping 30 matching lines @@
                                     &link_label) == sync_ui_util::SYNC_ERROR;
   sync_status->SetString("statusText", status_label);
   sync_status->SetString("actionLinkText", link_label);
   sync_status->SetBoolean("hasError", status_has_error);
 
   sync_status->SetBoolean("managed", service && service->IsManaged());
   sync_status->SetBoolean("signedIn", signin->IsAuthenticated());
   sync_status->SetBoolean("hasUnrecoverableError",
                           service && service->HasUnrecoverableError());
 
-  std::string name;
-  std::string icon_url;
-  GetAccountNameAndIcon(*profile_, &name, &icon_url);
-  sync_status->SetString("name", name);
-  sync_status->SetString("iconURL", icon_url);
-
   return sync_status.Pass();
 }
 
 bool PeopleHandler::IsExistingWizardPresent() {
   LoginUIService* service = GetLoginUIService();
   DCHECK(service);
   return service->current_login_ui() != nullptr;
 }
 
 bool PeopleHandler::FocusExistingWizardIfPresent() {
@@ skipping 134 matching lines @@
 void PeopleHandler::UpdateSyncState() {
   web_ui()->CallJavascriptFunction("settings.SyncPrivateApi.sendSyncStatus",
                                    *GetSyncStateDictionary());
 }
 
 void PeopleHandler::OnSigninAllowedPrefChange() {
   UpdateSyncState();
 }
 
 }  // namespace settings