Make image_decoder a Leaky LazyInstance

chrome/browser/chromeos/login/screens/user_image_screen.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_USER_IMAGE_SCREEN_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_USER_IMAGE_SCREEN_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chromeos/camera_presence_notifier.h"
@@ skipping 14 matching lines @@
 class PolicyChangeRegistrar;
 }
 
 namespace chromeos {
 
 class ScreenManager;
 class UserImageManager;
 class UserImageView;
 
 class UserImageScreen : public UserImageModel,
-                        public ImageDecoder::Delegate,
+                        public ImageDecoder::ImageRequest,
                         public content::NotificationObserver,
                         public UserImageSyncObserver::Observer,
                         public CameraPresenceNotifier::Observer {
  public:
   UserImageScreen(BaseScreenDelegate* base_screen_delegate,
                   UserImageView* view);
   ~UserImageScreen() override;
 
   static UserImageScreen* Get(ScreenManager* manager);
 
   // BaseScreen implementation:
   void PrepareToShow() override;
   void Show() override;
   void Hide() override;
 
   // UserImageScreenActor::Delegate implementation:
   void OnScreenReady() override;
   void OnPhotoTaken(const std::string& raw_data) override;
   void OnImageSelected(const std::string& image_url,
                        const std::string& image_type,
                        bool is_user_selection) override;
   void OnImageAccepted() override;
   void OnViewDestroyed(UserImageView* view) override;
 
   // content::NotificationObserver implementation:
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) override;
 
-  // ImageDecoder::Delegate implementation:
-  void OnImageDecoded(const ImageDecoder* decoder,
-                      const SkBitmap& decoded_image) override;
-  void OnDecodeImageFailed(const ImageDecoder* decoder) override;
+  // ImageDecoder::ImageRequest implementation:
+  void OnImageDecoded(const SkBitmap& decoded_image) override;
+  void OnDecodeImageFailed() override;
 
   // CameraPresenceNotifier::Observer implementation:
   void OnCameraPresenceCheckDone(bool is_camera_present) override;
 
   // UserImageSyncObserver::Observer implementation:
   void OnInitialSync(bool local_image_updated) override;
 
   bool user_selected_image() const { return user_has_selected_image_; }
 
  private:
@@ skipping 22 matching lines @@
 
   // Closes the screen.
   void ExitScreen();
 
   content::NotificationRegistrar notification_registrar_;
 
   scoped_ptr<policy::PolicyChangeRegistrar> policy_registrar_;
 
   UserImageView* view_;
 
-  // Last ImageDecoder instance used to decode an image blob received by
-  // HandlePhotoTaken.
-  scoped_refptr<ImageDecoder> image_decoder_;
-
   // Last user photo, if taken.
   gfx::ImageSkia user_photo_;
 
   // 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_;
 
   // Index of the selected user image.
   int selected_image_;
 
   // Timer used for waiting for user image sync.
   scoped_ptr<base::Timer> sync_timer_;
 
   // If screen ready to be shown.
   bool is_screen_ready_;
 
   // True if user has explicitly selected some image.
   bool user_has_selected_image_;
 
   DISALLOW_COPY_AND_ASSIGN(UserImageScreen);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_USER_IMAGE_SCREEN_H_