Move logic in UserImageScreen from UserImageScreenHandler

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

Index: chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h
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 84d1e7525ddb3e32f24ad3d9249e0ef946cfae03..9602558b939ef1e991d1f05f02282c33d12fb4fe 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
@@ -10,10 +10,8 @@
 #include "base/memory/weak_ptr.h"
 #include "base/time.h"
 #include "chrome/browser/chromeos/login/screens/user_image_screen_actor.h"
-#include "chrome/browser/image_decoder.h"
 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
-#include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/native_widget_types.h"
 
@@ -22,15 +20,17 @@ namespace chromeos {
 // WebUI implementation of UserImageScreenActor. It is used to interact
 // with JS page part allowing user to select avatar.
 class UserImageScreenHandler : public UserImageScreenActor,
-                               public BaseScreenHandler,
-                               public ImageDecoder::Delegate {
+                               public BaseScreenHandler {
  public:
   UserImageScreenHandler();
   virtual ~UserImageScreenHandler();
 
   // BaseScreenHandler implementation:
-  virtual void DeclareLocalizedValues(LocalizedValuesBuilder* builder) OVERRIDE;
   virtual void Initialize() OVERRIDE;
+  virtual void DeclareLocalizedValues(LocalizedValuesBuilder* builder) OVERRIDE;
+
+  // WebUIMessageHandler implementation:
+  virtual void RegisterMessages() OVERRIDE;
 
   // UserImageScreenActor implementation:
   virtual void SetDelegate(
@@ -38,18 +38,16 @@ class UserImageScreenHandler : public UserImageScreenActor,
   virtual void Show() OVERRIDE;
   virtual void Hide() OVERRIDE;
   virtual void PrepareToShow() OVERRIDE;
+
   virtual void SelectImage(int index) OVERRIDE;
-  virtual void CheckCameraPresence() OVERRIDE;
-  virtual void AddProfileImage(const gfx::ImageSkia& image) OVERRIDE;
+  virtual void SendProfileImage(const std::string& data_url) OVERRIDE;
   virtual void OnProfileImageAbsent() OVERRIDE;
+
   virtual void SetProfilePictureEnabled(bool enabled) OVERRIDE;
 
-  // WebUIMessageHandler implementation:
-  virtual void RegisterMessages() OVERRIDE;
+  virtual void SetCameraPresent(bool enabled) OVERRIDE;
 
  private:
-  // Sends profile image as a data URL to the page.
-  void SendProfileImage(const std::string& data_url);
 
   // Sends image data to the page.
   void HandleGetImages();
@@ -70,46 +68,11 @@ class UserImageScreenHandler : public UserImageScreenActor,
   // Called when the user image screen has been loaded and shown.
   void HandleScreenShown();
 
-  // Called when the camera presence check has been completed.
-  void OnCameraPresenceCheckDone();
-
-  // Overriden from ImageDecoder::Delegate:
-  virtual void OnImageDecoded(const ImageDecoder* decoder,
-                              const SkBitmap& decoded_image) OVERRIDE;
-  virtual void OnDecodeImageFailed(const ImageDecoder* decoder) OVERRIDE;
-
-
   UserImageScreenActor::Delegate* screen_;
 
   // Keeps whether screen should be shown right after initialization.
   bool show_on_init_;
 
-  // Index of the selected user image.
-  int selected_image_;
-
-  // Last user photo, if taken.
-  gfx::ImageSkia user_photo_;
-
-  // Last ImageDecoder instance used to decode an image blob received by
-  // HandlePhotoTaken.
-  scoped_refptr<ImageDecoder> image_decoder_;
-
-  // If |true|, decoded photo should be immediately accepeted (i.e., both
-  // HandleTakePhoto and HandleImageAccepted have already been called but we're
-  // still waiting for  photo image decoding to finish.
-  bool accept_photo_after_decoding_;
-
-  // Data URL for |user_photo_|.
-  std::string user_photo_data_url_;
-
-  // Data URL of the profile picture;
-  std::string profile_picture_data_url_;
-
-  // True if user has no custom profile picture.
-  bool profile_picture_absent_;
-
-  base::WeakPtrFactory<UserImageScreenHandler> weak_factory_;
-
   base::Time screen_show_time_;
 
   DISALLOW_COPY_AND_ASSIGN(UserImageScreenHandler);