cros: Fold UserImageModel into UserImageScreen

chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc

 // Copyright (c) 2013 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/chromeos/login/user_image_screen_handler.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/oobe_screen.h"
-#include "chrome/browser/chromeos/login/screens/user_image_model.h"
+#include "chrome/browser/chromeos/login/screens/user_image_screen.h"
 #include "chrome/browser/chromeos/login/ui/webui_login_display.h"
 #include "chrome/browser/chromeos/login/users/default_user_image/default_user_images.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/browser_resources.h"
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/audio/chromeos_sounds.h"
 #include "components/login/localized_values_builder.h"
 #include "components/strings/grit/components_strings.h"
 #include "components/user_manager/user.h"
 #include "media/audio/sounds/sounds_manager.h"
 #include "net/base/data_url.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "url/gurl.h"
 
 namespace {
 
 const char kJsScreenPath[] = "login.UserImageScreen";
 
 }  // namespace
 
 namespace chromeos {
 
 UserImageScreenHandler::UserImageScreenHandler()
-    : BaseScreenHandler(kJsScreenPath),
-      model_(nullptr),
-      show_on_init_(false),
-      is_ready_(false) {
+    : BaseScreenHandler(kJsScreenPath) {
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   media::SoundsManager* manager = media::SoundsManager::Get();
   manager->Initialize(SOUND_OBJECT_DELETE,
                       bundle.GetRawDataResource(IDR_SOUND_OBJECT_DELETE_WAV));
   manager->Initialize(SOUND_CAMERA_SNAP,
                       bundle.GetRawDataResource(IDR_SOUND_CAMERA_SNAP_WAV));
 }
 
 UserImageScreenHandler::~UserImageScreenHandler() {
-  if (model_)
-    model_->OnViewDestroyed(this);
+  if (screen_)
+    screen_->OnViewDestroyed(this);
 }
 
 void UserImageScreenHandler::Initialize() {
   if (show_on_init_) {
     Show();
     show_on_init_ = false;
   }
 }
 
-void UserImageScreenHandler::Bind(UserImageModel& model) {
-  model_ = &model;
-  BaseScreenHandler::SetBaseScreen(model_);
+void UserImageScreenHandler::Bind(UserImageScreen* screen) {
+  screen_ = screen;
+  BaseScreenHandler::SetBaseScreen(screen_);
 }
 
 void UserImageScreenHandler::Unbind() {
-  model_ = nullptr;
+  screen_ = nullptr;
   BaseScreenHandler::SetBaseScreen(nullptr);
 }
 
 void UserImageScreenHandler::Show() {
   if (!page_is_ready()) {
     show_on_init_ = true;
     return;
   }
   screen_show_time_ = base::Time::Now();
   ShowScreen(OobeScreen::SCREEN_USER_IMAGE_PICKER);
 
   // When shown, query camera presence.
-  if (model_ && is_ready_)
-    model_->OnScreenReady();
+  if (screen_ && is_ready_)
+    screen_->OnScreenReady();
 }
 
 void UserImageScreenHandler::Hide() {
 }
 
 void UserImageScreenHandler::DeclareLocalizedValues(
     ::login::LocalizedValuesBuilder* builder) {
   builder->Add("userImageScreenTitle", IDS_USER_IMAGE_SCREEN_TITLE);
   builder->Add("userImageScreenDescription",
                IDS_OPTIONS_CHANGE_PICTURE_DIALOG_TEXT);
@@ skipping 46 matching lines @@
                               default_user_image::kDefaultImageWebsiteIDs[i]));
     image_data->SetString("title",
                           default_user_image::GetDefaultImageDescription(i));
     image_urls.Append(std::move(image_data));
   }
   CallJS("setDefaultImages", image_urls);
 }
 
 void UserImageScreenHandler::HandleScreenReady() {
   is_ready_ = true;
-  if (model_)
-    model_->OnScreenReady();
+  if (screen_)
+    screen_->OnScreenReady();
 }
 
 void UserImageScreenHandler::HandlePhotoTaken(const std::string& image_url) {
   std::string mime_type, charset, raw_data;
   if (!net::DataURL::Parse(GURL(image_url), &mime_type, &charset, &raw_data))
     NOTREACHED();
   DCHECK_EQ("image/png", mime_type);
 
-  if (model_)
-    model_->OnPhotoTaken(raw_data);
+  if (screen_)
+    screen_->OnPhotoTaken(raw_data);
 }
 
 void UserImageScreenHandler::HandleTakePhoto() {
   AccessibilityManager::Get()->PlayEarcon(
       SOUND_CAMERA_SNAP, PlaySoundOption::SPOKEN_FEEDBACK_ENABLED);
 }
 
 void UserImageScreenHandler::HandleDiscardPhoto() {
   AccessibilityManager::Get()->PlayEarcon(
       SOUND_OBJECT_DELETE, PlaySoundOption::SPOKEN_FEEDBACK_ENABLED);
 }
 
 void UserImageScreenHandler::HandleSelectImage(const std::string& image_url,
                                                const std::string& image_type,
                                                bool is_user_selection) {
-  if (model_)
-    model_->OnImageSelected(image_type, image_url, is_user_selection);
+  if (screen_)
+    screen_->OnImageSelected(image_type, image_url, is_user_selection);
 }
 
 void UserImageScreenHandler::HandleImageAccepted() {
-  if (model_)
-    model_->OnImageAccepted();
+  if (screen_)
+    screen_->OnImageAccepted();
 }
 
 void UserImageScreenHandler::HandleScreenShown() {
   DCHECK(!screen_show_time_.is_null());
 
   base::TimeDelta delta = base::Time::Now() - screen_show_time_;
   VLOG(1) << "Screen load time: " << delta.InSecondsF();
   UMA_HISTOGRAM_TIMES("UserImage.ScreenIsShownTime", delta);
 }
 
 void UserImageScreenHandler::HideCurtain() {
   CallJS("hideCurtain");
 }
 
 }  // namespace chromeos