Make image_decoder a Leaky LazyInstance

chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.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_UI_WEBUI_OPTIONS_CHROMEOS_CHANGE_PICTURE_OPTIONS_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_CHANGE_PICTURE_OPTIONS_HANDLER_H_
 
 #include "chrome/browser/chromeos/camera_presence_notifier.h"
 #include "chrome/browser/image_decoder.h"
 #include "chrome/browser/ui/webui/options/options_ui.h"
@@ skipping 13 matching lines @@
 }
 
 namespace chromeos {
 
 namespace options {
 
 // ChromeOS user image options page UI handler.
 class ChangePictureOptionsHandler : public ::options::OptionsPageUIHandler,
                                     public ui::SelectFileDialog::Listener,
                                     public content::NotificationObserver,
-                                    public ImageDecoder::Delegate,
+                                    public ImageDecoder::ImageRequest,
                                     public CameraPresenceNotifier::Observer {
  public:
   ChangePictureOptionsHandler();
   ~ChangePictureOptionsHandler() override;
 
   // OptionsPageUIHandler implementation.
   void GetLocalizedValues(base::DictionaryValue* localized_strings) override;
 
   // WebUIMessageHandler implementation.
   void RegisterMessages() override;
@@ skipping 61 matching lines @@
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) override;
 
   // Sets user image to photo taken from camera.
   void SetImageFromCamera(const gfx::ImageSkia& photo);
 
   // Returns handle to browser window or NULL if it can't be found.
   gfx::NativeWindow GetBrowserWindow() const;
 
-  // Overriden from ImageDecoder::Delegate:
-  void OnImageDecoded(const ImageDecoder* decoder,
-                      const SkBitmap& decoded_image) override;
-  void OnDecodeImageFailed(const ImageDecoder* decoder) override;
+  // Overriden from ImageDecoder::ImageRequest:
+  void OnImageDecoded(const SkBitmap& decoded_image) override;
+  void OnDecodeImageFailed() override;
 
   // Returns user related to current WebUI. If this user doesn't exist,
   // returns active user.
   const user_manager::User* GetUser() const;
 
   scoped_refptr<ui::SelectFileDialog> select_file_dialog_;
 
   // Previous user image from camera/file and its data URL.
   gfx::ImageSkia previous_image_;
   std::string previous_image_url_;
 
   // Index of the previous user image.
   int previous_image_index_;
 
   // Last user photo, if taken.
   gfx::ImageSkia user_photo_;
 
   // Data URL for |user_photo_|.
   std::string user_photo_data_url_;
 
   content::NotificationRegistrar registrar_;
 
-  // Last ImageDecoder instance used to decode an image blob received by
-  // HandlePhotoTaken.
-  scoped_refptr<ImageDecoder> image_decoder_;
-
   DISALLOW_COPY_AND_ASSIGN(ChangePictureOptionsHandler);
 };
 
 }  // namespace options
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_CHANGE_PICTURE_OPTIONS_HANDLER_H_