[cleanup] Removed dead code from avatar selection screen.

Params "user_id" and "profile_picture_enabled" were not used so I
removed them and related code.
Also one usage of GetProfileByUserUnsafe eliminated.

BUG=361528
TEST=browser_tests

Review URL: https://codereview.chromium.org/466793002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289661 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 34 insertions, 110 deletions

diff --git a/chrome/browser/chromeos/login/screens/user_image_screen.cc b/chrome/browser/chromeos/login/screens/user_image_screen.cc
index adbf390..b1f3391 100644
--- a/chrome/browser/chromeos/login/screens/user_image_screen.cc
+++ b/chrome/browser/chromeos/login/screens/user_image_screen.cc
@@ -62,13 +62,17 @@ UserImageScreen::UserImageScreen(ScreenObserver* screen_observer,
       actor_(actor),
       accept_photo_after_decoding_(false),
       selected_image_(user_manager::User::USER_IMAGE_INVALID),
-      profile_picture_enabled_(false),
       profile_picture_data_url_(url::kAboutBlankURL),
       profile_picture_absent_(false),
       is_screen_ready_(false),
       user_has_selected_image_(false) {
   actor_->SetDelegate(this);
-  SetProfilePictureEnabled(true);
+  notification_registrar_.Add(this,
+                              chrome::NOTIFICATION_PROFILE_IMAGE_UPDATED,
+                              content::NotificationService::AllSources());
+  notification_registrar_.Add(this,
+                              chrome::NOTIFICATION_PROFILE_IMAGE_UPDATE_FAILED,
+                              content::NotificationService::AllSources());
   notification_registrar_.Add(this,
                               chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED,
                               content::NotificationService::AllSources());
@@ -209,45 +213,13 @@ void UserImageScreen::OnImageAccepted() {
 }
 
 
-void UserImageScreen::SetProfilePictureEnabled(bool profile_picture_enabled) {
-  if (profile_picture_enabled_ == profile_picture_enabled)
-    return;
-  profile_picture_enabled_ = profile_picture_enabled;
-  if (profile_picture_enabled) {
-    notification_registrar_.Add(this,
-                                chrome::NOTIFICATION_PROFILE_IMAGE_UPDATED,
-                                content::NotificationService::AllSources());
-    notification_registrar_.Add(
-        this,
-        chrome::NOTIFICATION_PROFILE_IMAGE_UPDATE_FAILED,
-        content::NotificationService::AllSources());
-  } else {
-    notification_registrar_.Remove(this,
-                                   chrome::NOTIFICATION_PROFILE_IMAGE_UPDATED,
-        content::NotificationService::AllSources());
-    notification_registrar_.Remove(
-        this,
-        chrome::NOTIFICATION_PROFILE_IMAGE_UPDATE_FAILED,
-        content::NotificationService::AllSources());
-  }
-  if (actor_)
-    actor_->SetProfilePictureEnabled(profile_picture_enabled);
-}
-
-void UserImageScreen::SetUserID(const std::string& user_id) {
-  DCHECK(!user_id.empty());
-  user_id_ = user_id;
-}
-
 void UserImageScreen::PrepareToShow() {
   if (actor_)
     actor_->PrepareToShow();
 }
 
 const user_manager::User* UserImageScreen::GetUser() {
-  if (user_id_.empty())
-    return UserManager::Get()->GetLoggedInUser();
-  return UserManager::Get()->FindUser(user_id_);
+  return UserManager::Get()->GetLoggedInUser();
 }
 
 UserImageManager* UserImageScreen::GetUserImageManager() {
@@ -263,8 +235,7 @@ void UserImageScreen::Show() {
     return;
 
   DCHECK(!policy_registrar_);
-  Profile* profile = ProfileHelper::Get()->GetProfileByUserUnsafe(GetUser());
-  if (profile) {
+  if (Profile* profile = ProfileHelper::Get()->GetProfileByUser(GetUser())) {
     policy::PolicyService* policy_service =
         policy::ProfilePolicyConnectorFactory::GetForProfile(profile)->
             policy_service();
@@ -309,19 +280,17 @@ void UserImageScreen::Show() {
   }
   CameraPresenceNotifier::GetInstance()->AddObserver(this);
   actor_->Show();
-  actor_->SetProfilePictureEnabled(profile_picture_enabled_);
 
   selected_image_ = GetUser()->image_index();
   actor_->SelectImage(selected_image_);
 
-  if (profile_picture_enabled_) {
-    // Start fetching the profile image.
-    GetUserImageManager()->DownloadProfileImage(kProfileDownloadReason);
-  }
+  // Start fetching the profile image.
+  GetUserImageManager()->DownloadProfileImage(kProfileDownloadReason);
 }
 
 void UserImageScreen::Hide() {
   CameraPresenceNotifier::GetInstance()->RemoveObserver(this);
+  notification_registrar_.RemoveAll();
   if (actor_)
     actor_->Hide();
 }
@@ -338,7 +307,6 @@ void UserImageScreen::OnActorDestroyed(UserImageScreenActor* actor) {
 void UserImageScreen::Observe(int type,
                               const content::NotificationSource& source,
                               const content::NotificationDetails& details) {
-  DCHECK(profile_picture_enabled_);
   switch (type) {
     case chrome::NOTIFICATION_PROFILE_IMAGE_UPDATED: {
       // We've got a new profile image.
diff --git a/chrome/browser/chromeos/login/screens/user_image_screen.h b/chrome/browser/chromeos/login/screens/user_image_screen.h
index d8e3259..506901e 100644
--- a/chrome/browser/chromeos/login/screens/user_image_screen.h
+++ b/chrome/browser/chromeos/login/screens/user_image_screen.h
@@ -38,11 +38,6 @@ class UserImageScreen: public WizardScreen,
                   UserImageScreenActor* actor);
   virtual ~UserImageScreen();
 
-  // Indicates whether profile picture is enabled for given user.
-  void SetProfilePictureEnabled(bool support_profile_picture);
-  // Sets |user_id| of user that would have picture updated.
-  void SetUserID(const std::string& user_id);
-
   // WizardScreen implementation:
   virtual void PrepareToShow() OVERRIDE;
   virtual void Show() OVERRIDE;
@@ -128,16 +123,12 @@ class UserImageScreen: public WizardScreen,
   // Index of the selected user image.
   int selected_image_;
 
-  bool profile_picture_enabled_;
-
   // Encoded profile picture.
   std::string profile_picture_data_url_;
 
   // True if user has no custom profile picture.
   bool profile_picture_absent_;
 
-  std::string user_id_;
-
   // Timer used for waiting for user image sync.
   scoped_ptr<base::Timer> sync_timer_;
 
diff --git a/chrome/browser/chromeos/login/screens/user_image_screen_actor.h b/chrome/browser/chromeos/login/screens/user_image_screen_actor.h
index ad984cc..4630a83 100644
--- a/chrome/browser/chromeos/login/screens/user_image_screen_actor.h
+++ b/chrome/browser/chromeos/login/screens/user_image_screen_actor.h
@@ -68,9 +68,6 @@ class UserImageScreenActor {
   // Indicates that there is no custom profile image for the user.
   virtual void OnProfileImageAbsent() = 0;
 
-  // Enables or disables profile picture.
-  virtual void SetProfilePictureEnabled(bool enabled) = 0;
-
   // Sends result of camera check
   virtual void SetCameraPresent(bool enabled) = 0;
 
diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
index 3dba85a..9ba3c1b4 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -453,25 +453,12 @@ void WizardController::ShowUserImageScreen() {
   }
   VLOG(1) << "Showing user image screen.";
 
-  bool profile_picture_enabled = true;
-  std::string user_id;
-  if (screen_parameters_.get()) {
-    screen_parameters_->GetBoolean("profile_picture_enabled",
-        &profile_picture_enabled);
-    screen_parameters_->GetString("user_id", &user_id);
-  }
-
   // Status area has been already shown at sign in screen so it
   // doesn't make sense to hide it here and then show again at user session as
   // this produces undesired UX transitions.
   SetStatusAreaVisible(true);
 
-  UserImageScreen* screen = GetUserImageScreen();
-  if (!user_id.empty())
-    screen->SetUserID(user_id);
-  screen->SetProfilePictureEnabled(profile_picture_enabled);
-
-  SetCurrentScreen(screen);
+  SetCurrentScreen(GetUserImageScreen());
 }
 
 void WizardController::ShowEulaScreen() {
diff --git a/chrome/browser/resources/chromeos/login/oobe_screen_user_image.css b/chrome/browser/resources/chromeos/login/oobe_screen_user_image.css
index ef63606..c0d976d 100644
--- a/chrome/browser/resources/chromeos/login/oobe_screen_user_image.css
+++ b/chrome/browser/resources/chromeos/login/oobe_screen_user_image.css
@@ -78,16 +78,16 @@
 /* White background for spinner styled like user image */
 #profile-image .spinner-bg {
   background-color: white;
+  display: none;
   height: 50px;
   left: 3px;
   position: absolute;
   top: 3px;
-  visibility: hidden;
   width: 50px;
 }
 
 .profile-image-loading #profile-image .spinner-bg {
-  visibility: visible;
+  display: block;
 }
 
 #profile-image .spinner {
diff --git a/chrome/browser/resources/chromeos/login/oobe_screen_user_image.js b/chrome/browser/resources/chromeos/login/oobe_screen_user_image.js
index cb7d0a2..3979dc7 100644
--- a/chrome/browser/resources/chromeos/login/oobe_screen_user_image.js
+++ b/chrome/browser/resources/chromeos/login/oobe_screen_user_image.js
@@ -61,11 +61,6 @@ cr.define('login', function() {
     selectedUserImage_: -1,
 
     /**
-     * Indicates if profile picture should be displayed on current screen.
-     */
-    profilePictureEnabled_: false,
-
-    /**
      * URL for profile picture.
      */
     profileImageUrl_: null,
@@ -97,10 +92,26 @@ cr.define('login', function() {
           loadTimeData.getString('takePhoto'),
           loadTimeData.getString('photoFromCamera'));
 
-      this.setProfilePictureEnabled_(true);
-
       this.profileImageLoading = true;
 
+      // Profile image data (if present).
+      this.profileImage_ = imageGrid.addItem(
+          ButtonImages.PROFILE_PICTURE,           // Image URL.
+          loadTimeData.getString('profilePhoto'), // Title.
+          undefined,                              // Click handler.
+          0,                                      // Position.
+          function(el) {
+            // Custom decorator for Profile image element.
+            var spinner = el.ownerDocument.createElement('div');
+            spinner.className = 'spinner';
+            var spinnerBg = el.ownerDocument.createElement('div');
+            spinnerBg.className = 'spinner-bg';
+            spinnerBg.appendChild(spinner);
+            el.appendChild(spinnerBg);
+            el.id = 'profile-image';
+          });
+      this.profileImage_.type = 'profile';
+
       $('take-photo').addEventListener(
           'click', this.handleTakePhoto_.bind(this));
       $('discard-photo').addEventListener(
@@ -164,8 +175,8 @@ cr.define('login', function() {
     },
     set profileImageLoading(value) {
       this.profileImageLoading_ = value;
-      $('user-image-screen-main').classList[
-          value ? 'add' : 'remove']('profile-image-loading');
+      $('user-image-screen-main').classList.toggle('profile-image-loading',
+                                                   value);
       if (value)
         announceAccessibleMessage(loadTimeData.getString('syncingPreferences'));
       this.updateProfileImageCaption_();
@@ -349,32 +360,8 @@ cr.define('login', function() {
      * @private
      */
     setProfilePictureEnabled_: function(enabled) {
-      if (this.profilePictureEnabled_ == enabled)
-        return;
-      this.profilePictureEnabled_ = enabled;
       var imageGrid = $('user-image-grid');
       if (enabled) {
-        var url = ButtonImages.PROFILE_PICTURE;
-        if (!this.profileImageLoading && this.profileImageUrl_ !== null) {
-          url = this.profileImageUrl_;
-        }
-        // Profile image data (if present).
-        this.profileImage_ = imageGrid.addItem(
-            url,                                    // Image URL.
-            loadTimeData.getString('profilePhoto'), // Title.
-            undefined,                              // Click handler.
-            0,                                      // Position.
-            this.profileImageLoading ? function(el) {
-              // Custom decorator for Profile image element.
-              var spinner = el.ownerDocument.createElement('div');
-              spinner.className = 'spinner';
-              var spinnerBg = el.ownerDocument.createElement('div');
-              spinnerBg.className = 'spinner-bg';
-              spinnerBg.appendChild(spinner);
-              el.appendChild(spinnerBg);
-              el.id = 'profile-image';
-            } : undefined);
-        this.profileImage_.type = 'profile';
       } else {
         imageGrid.removeItem(this.profileImage_);
       }
diff --git a/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc
index 587b4b7..99e8dd6 100644
--- a/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc
@@ -220,8 +220,4 @@ void UserImageScreenHandler::HideCurtain() {
   CallJS("hideCurtain");
 }
 
-void UserImageScreenHandler::SetProfilePictureEnabled(bool enabled) {
-  CallJS("setProfilePictureEnabled", enabled);
-}
-
 }  // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h
index 68e3236..826444d 100644
--- a/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h
@@ -43,8 +43,6 @@ class UserImageScreenHandler : public UserImageScreenActor,
   virtual void SendProfileImage(const std::string& data_url) OVERRIDE;
   virtual void OnProfileImageAbsent() OVERRIDE;
 
-  virtual void SetProfilePictureEnabled(bool enabled) OVERRIDE;
-
   virtual void SetCameraPresent(bool enabled) OVERRIDE;
 
   virtual void HideCurtain() OVERRIDE;