[cleanup] Removed dead code from avatar selection screen.

chrome/browser/chromeos/login/screens/user_image_screen.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/chromeos/login/screens/user_image_screen.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 38 matching lines @@
 
 namespace chromeos {
 
 namespace {
 
 // Time histogram suffix for profile image download.
 const char kProfileDownloadReason[] = "OOBE";
 
 // Maximum amount of time to wait for the user image to sync.
 // The screen is shown iff sync failed or time limit exceeded.
-const int kSyncTimeoutSeconds = 10;
+const int kSyncTimeoutSeconds = 0;

[Nikita (slow), 2014/08/13 16:30:29]

Debug change?

[dzhioev (left Google), 2014/08/13 18:06:42]

Yes. Fixed.

 
 }  // namespace
 
 UserImageScreen::UserImageScreen(ScreenObserver* screen_observer,
                                  UserImageScreenActor* actor)
     : WizardScreen(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());
 }
 
 UserImageScreen::~UserImageScreen() {
   CameraPresenceNotifier::GetInstance()->RemoveObserver(this);
   if (actor_)
     actor_->SetDelegate(NULL);
   if (image_decoder_.get())
@@ skipping 120 matching lines @@
   }
   if (user_has_selected_image_) {
     UMA_HISTOGRAM_ENUMERATION("UserImage.FirstTimeChoice",
                               uma_index,
                               user_manager::kHistogramImagesCount);
   }
   ExitScreen();
 }
 
 
-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,

[Nikita (slow), 2014/08/13 16:30:29]

What about this code of removing notification subscription?

[dzhioev (left Google), 2014/08/13 18:06:42]

Done.

-                                   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() {
   return UserManager::Get()->GetUserImageManager(GetUser()->email());
 }
 
 UserImageSyncObserver* UserImageScreen::GetSyncObserver() {
   return GetUserImageManager()->GetSyncObserver();
 }
 
 void UserImageScreen::Show() {
   if (!actor_)
     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();
     if (policy_service->GetPolicies(
             policy::PolicyNamespace(policy::POLICY_DOMAIN_CHROME,
                                     std::string()))
             .Get(policy::key::kUserAvatarImage)) {
       // If the user image is managed by policy, skip the screen because the
       // user is not allowed to override a policy-set image.
       ExitScreen();
@@ skipping 24 matching lines @@
       sync_timer_.reset(new base::Timer(
             FROM_HERE,
             base::TimeDelta::FromSeconds(kSyncTimeoutSeconds),
             base::Bind(&UserImageScreen::OnSyncTimeout, base::Unretained(this)),
             false));
       sync_timer_->Reset();
     }
   }
   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);
   if (actor_)
     actor_->Hide();
 }
 
 std::string UserImageScreen::GetName() const {
   return WizardController::kUserImageScreenName;
 }
 
 void UserImageScreen::OnActorDestroyed(UserImageScreenActor* actor) {
   if (actor_ == actor)
     actor_ = NULL;
 }
 
 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.
       profile_picture_data_url_ = webui::GetBitmapDataUrl(
           *content::Details<const gfx::ImageSkia>(details).ptr()->bitmap());
       if (actor_)
         actor_->SendProfileImage(profile_picture_data_url_);
       break;
     }
     case chrome::NOTIFICATION_PROFILE_IMAGE_UPDATE_FAILED: {
@@ skipping 27 matching lines @@
 
 void UserImageScreen::ExitScreen() {
   policy_registrar_.reset();
   sync_timer_.reset();
   if (UserImageSyncObserver* sync_observer = GetSyncObserver())
     sync_observer->RemoveObserver(this);
   get_screen_observer()->OnExit(ScreenObserver::USER_IMAGE_SELECTED);
 }
 
 }  // namespace chromeos