cros: Fold UserImageModel into UserImageScreen

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 30 matching lines @@
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/webui/web_ui_util.h"
 #include "ui/gfx/image/image_skia.h"
 
 using content::BrowserThread;
 
 namespace chromeos {
 
 namespace {
 
+constexpr const char kContextKeyIsCameraPresent[] = "isCameraPresent";
+constexpr const char kContextKeyProfilePictureDataURL[] =
+    "profilePictureDataURL";
+constexpr const char kContextKeySelectedImageURL[] = "selectedImageURL";
+constexpr const char kContextKeyHasGaiaAccount[] = "hasGaiaAccount";
+
 // 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;
 
 }  // namespace
 
 // static
 UserImageScreen* UserImageScreen::Get(ScreenManager* manager) {
   return static_cast<UserImageScreen*>(
       manager->GetScreen(OobeScreen::SCREEN_USER_IMAGE_PICKER));
 }
 
 UserImageScreen::UserImageScreen(BaseScreenDelegate* base_screen_delegate,
                                  UserImageView* view)
-    : UserImageModel(base_screen_delegate),
-      view_(view),
-      accept_photo_after_decoding_(false),
-      selected_image_(user_manager::User::USER_IMAGE_INVALID),
-      is_screen_ready_(false),
-      user_has_selected_image_(false) {
+    : BaseScreen(base_screen_delegate, OobeScreen::SCREEN_USER_IMAGE_PICKER),
+      view_(view) {
   if (view_)
-    view_->Bind(*this);
+    view_->Bind(this);
   user_manager::UserManager::Get()->AddObserver(this);
   GetContextEditor().SetString(kContextKeyProfilePictureDataURL, std::string());
 }
 
 UserImageScreen::~UserImageScreen() {
   user_manager::UserManager::Get()->RemoveObserver(this);
   CameraPresenceNotifier::GetInstance()->RemoveObserver(this);
   if (view_)
     view_->Unbind();
 }
 
 void UserImageScreen::OnScreenReady() {
   is_screen_ready_ = true;
   if (!IsWaitingForSync())
     HideCurtain();
 }
 
 void UserImageScreen::OnPhotoTaken(const std::string& raw_data) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   user_photo_ = gfx::ImageSkia();
   ImageDecoder::Cancel(this);
   ImageDecoder::Start(this, raw_data);
 }
 
-void UserImageScreen::OnCameraPresenceCheckDone(bool is_camera_present) {
-  GetContextEditor().SetBoolean(kContextKeyIsCameraPresent, is_camera_present);
-}
-
-void UserImageScreen::HideCurtain() {
-  // Skip user image selection for ephemeral users.
-  if (user_manager::UserManager::Get()->IsUserNonCryptohomeDataEphemeral(
-          GetUser()->GetAccountId())) {
-    ExitScreen();
-  }
-  if (view_)
-    view_->HideCurtain();
-}
-
-void UserImageScreen::OnImageDecoded(const SkBitmap& decoded_image) {
-  user_photo_ = gfx::ImageSkia::CreateFrom1xBitmap(decoded_image);
-  if (accept_photo_after_decoding_)
-    OnImageAccepted();
-}
-
-void UserImageScreen::OnDecodeImageFailed() {
-  NOTREACHED() << "Failed to decode PNG image from WebUI";
-}
-
-void UserImageScreen::OnInitialSync(bool local_image_updated) {
-  DCHECK(sync_timer_);
-  ReportSyncResult(SyncResult::SUCCEEDED);
-  if (!local_image_updated) {
-    sync_timer_.reset();
-    GetSyncObserver()->RemoveObserver(this);
-    if (is_screen_ready_)
-      HideCurtain();
-    return;
-  }
-  ExitScreen();
-}
-
-void UserImageScreen::OnSyncTimeout() {
-  ReportSyncResult(SyncResult::TIMED_OUT);
-  sync_timer_.reset();
-  GetSyncObserver()->RemoveObserver(this);
-  if (is_screen_ready_)
-    HideCurtain();
-}
-
-bool UserImageScreen::IsWaitingForSync() const {
-  return sync_timer_.get() && sync_timer_->IsRunning();
-}
-
-void UserImageScreen::OnUserImagePolicyChanged(const base::Value* previous,
-                                               const base::Value* current) {
-  if (current) {
-    base::ThreadTaskRunnerHandle::Get()->DeleteSoon(
-        FROM_HERE, policy_registrar_.release());
-    ExitScreen();
-  }
-}
-
 void UserImageScreen::OnImageSelected(const std::string& image_type,
                                       const std::string& image_url,
                                       bool is_user_selection) {
   if (is_user_selection) {
     user_has_selected_image_ = true;
   }
   if (image_url.empty())
     return;
   int user_image_index = user_manager::User::USER_IMAGE_INVALID;
   if (image_type == "default" &&
@@ skipping 34 matching lines @@
           default_user_image::GetDefaultImageHistogramValue(selected_image_);
       break;
   }
   if (user_has_selected_image_) {
     UMA_HISTOGRAM_ENUMERATION("UserImage.FirstTimeChoice", uma_index,
                               default_user_image::kHistogramImagesCount);
   }
   ExitScreen();
 }
 
-const user_manager::User* UserImageScreen::GetUser() {
-  return user_manager::UserManager::Get()->GetActiveUser();
-}
-
-UserImageManager* UserImageScreen::GetUserImageManager() {
-  return ChromeUserManager::Get()->GetUserImageManager(
-      GetUser()->GetAccountId());
-}
-
-UserImageSyncObserver* UserImageScreen::GetSyncObserver() {
-  return GetUserImageManager()->GetSyncObserver();
+void UserImageScreen::OnViewDestroyed(UserImageView* view) {
+  if (view_ == view)
+    view_ = nullptr;
 }
 
 void UserImageScreen::Show() {
   if (!view_)
     return;
 
   DCHECK(!policy_registrar_);
   if (Profile* profile = ProfileHelper::Get()->GetProfileByUser(GetUser())) {
     policy::PolicyService* policy_service =
         policy::ProfilePolicyConnectorFactory::GetForBrowserContext(profile)
@@ skipping 61 matching lines @@
   CameraPresenceNotifier::GetInstance()->RemoveObserver(this);
   user_manager::UserManager::Get()->RemoveObserver(this);
   policy_registrar_.reset();
   sync_timer_.reset();
   if (UserImageSyncObserver* sync_observer = GetSyncObserver())
     sync_observer->RemoveObserver(this);
   if (view_)
     view_->Hide();
 }
 
-void UserImageScreen::OnViewDestroyed(UserImageView* view) {
-  if (view_ == view)
-    view_ = nullptr;
+void UserImageScreen::OnCameraPresenceCheckDone(bool is_camera_present) {
+  GetContextEditor().SetBoolean(kContextKeyIsCameraPresent, is_camera_present);
+}
+
+void UserImageScreen::OnImageDecoded(const SkBitmap& decoded_image) {
+  user_photo_ = gfx::ImageSkia::CreateFrom1xBitmap(decoded_image);
+  if (accept_photo_after_decoding_)
+    OnImageAccepted();
+}
+
+void UserImageScreen::OnDecodeImageFailed() {
+  NOTREACHED() << "Failed to decode PNG image from WebUI";
 }
 
 void UserImageScreen::OnUserImageChanged(const user_manager::User& user) {
   GetContextEditor().SetString(
       kContextKeySelectedImageURL,
       default_user_image::GetDefaultImageUrl(GetUser()->image_index()));
 }
 
 void UserImageScreen::OnUserProfileImageUpdateFailed(
     const user_manager::User& user) {
   // User has a default profile image or fetching profile image has failed.
   GetContextEditor().SetString(kContextKeyProfilePictureDataURL, std::string());
 }
 
 void UserImageScreen::OnUserProfileImageUpdated(
     const user_manager::User& user,
     const gfx::ImageSkia& profile_image) {
   // We've got a new profile image.
   GetContextEditor().SetString(
       kContextKeyProfilePictureDataURL,
       webui::GetBitmapDataUrl(*profile_image.bitmap()));
 }
 
+void UserImageScreen::OnInitialSync(bool local_image_updated) {
+  DCHECK(sync_timer_);
+  ReportSyncResult(SyncResult::SUCCEEDED);
+  if (!local_image_updated) {
+    sync_timer_.reset();
+    GetSyncObserver()->RemoveObserver(this);
+    if (is_screen_ready_)
+      HideCurtain();
+    return;
+  }
+  ExitScreen();
+}
+
+void UserImageScreen::OnSyncTimeout() {
+  ReportSyncResult(SyncResult::TIMED_OUT);
+  sync_timer_.reset();
+  GetSyncObserver()->RemoveObserver(this);
+  if (is_screen_ready_)
+    HideCurtain();
+}
+
+bool UserImageScreen::IsWaitingForSync() const {
+  return sync_timer_.get() && sync_timer_->IsRunning();
+}
+
+void UserImageScreen::OnUserImagePolicyChanged(const base::Value* previous,
+                                               const base::Value* current) {
+  if (current) {
+    base::ThreadTaskRunnerHandle::Get()->DeleteSoon(
+        FROM_HERE, policy_registrar_.release());
+    ExitScreen();
+  }
+}
+
+const user_manager::User* UserImageScreen::GetUser() {
+  return user_manager::UserManager::Get()->GetActiveUser();
+}
+
+UserImageManager* UserImageScreen::GetUserImageManager() {
+  return ChromeUserManager::Get()->GetUserImageManager(
+      GetUser()->GetAccountId());
+}
+
+UserImageSyncObserver* UserImageScreen::GetSyncObserver() {
+  return GetUserImageManager()->GetSyncObserver();
+}
+
+void UserImageScreen::HideCurtain() {
+  // Skip user image selection for ephemeral users.
+  if (user_manager::UserManager::Get()->IsUserNonCryptohomeDataEphemeral(
+          GetUser()->GetAccountId())) {
+    ExitScreen();
+  }
+  if (view_)
+    view_->HideCurtain();
+}
+
 void UserImageScreen::ExitScreen() {
   policy_registrar_.reset();
   sync_timer_.reset();
   if (UserImageSyncObserver* sync_observer = GetSyncObserver())
     sync_observer->RemoveObserver(this);
   Finish(BaseScreenDelegate::USER_IMAGE_SELECTED);
 }
 
 void UserImageScreen::ReportSyncResult(SyncResult timed_out) const {
   base::TimeDelta duration = base::Time::Now() - sync_waiting_start_time_;
   UMA_HISTOGRAM_TIMES("Login.NewUserPriorityPrefsSyncTime", duration);
   UMA_HISTOGRAM_ENUMERATION("Login.NewUserPriorityPrefsSyncResult",
                             static_cast<int>(timed_out),
                             static_cast<int>(SyncResult::COUNT));
 }
 
 }  // namespace chromeos