Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / login / screens / user_image_screen.h

diff --git a/src/chrome/browser/chromeos/login/screens/user_image_screen.h b/src/chrome/browser/chromeos/login/screens/user_image_screen.h
index 47e4add..7f5ab2b 100644 (file)
--- a/src/chrome/browser/chromeos/login/screens/user_image_screen.h
+++ b/src/chrome/browser/chromeos/login/screens/user_image_screen.h
@@ -8,8 +8,8 @@
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chromeos/camera_presence_notifier.h"
+#include "chrome/browser/chromeos/login/screens/base_screen.h"
 #include "chrome/browser/chromeos/login/screens/user_image_screen_actor.h"
-#include "chrome/browser/chromeos/login/screens/wizard_screen.h"
 #include "chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h"
 #include "chrome/browser/image_decoder.h"
 #include "components/user_manager/user.h"
@@ -30,53 +30,53 @@ namespace chromeos {
 class UserImageManager;
 class ScreenManager;
 
-class UserImageScreen: public WizardScreen,
-                       public UserImageScreenActor::Delegate,
-                       public ImageDecoder::Delegate,
-                       public content::NotificationObserver,
-                       public UserImageSyncObserver::Observer,
-                       public CameraPresenceNotifier::Observer {
+class UserImageScreen : public BaseScreen,
+                        public UserImageScreenActor::Delegate,
+                        public ImageDecoder::Delegate,
+                        public content::NotificationObserver,
+                        public UserImageSyncObserver::Observer,
+                        public CameraPresenceNotifier::Observer {
  public:
-  UserImageScreen(ScreenObserver* screen_observer,
+  UserImageScreen(BaseScreenDelegate* base_screen_delegate,
                   UserImageScreenActor* actor);
   virtual ~UserImageScreen();
 
   static UserImageScreen* Get(ScreenManager* manager);
 
-  // WizardScreen implementation:
-  virtual void PrepareToShow() OVERRIDE;
-  virtual void Show() OVERRIDE;
-  virtual void Hide() OVERRIDE;
-  virtual std::string GetName() const OVERRIDE;
+  // BaseScreen implementation:
+  virtual void PrepareToShow() override;
+  virtual void Show() override;
+  virtual void Hide() override;
+  virtual std::string GetName() const override;
 
   // UserImageScreenActor::Delegate implementation:
-  virtual void OnScreenReady() OVERRIDE;
-  virtual void OnPhotoTaken(const std::string& raw_data) OVERRIDE;
+  virtual void OnScreenReady() override;
+  virtual void OnPhotoTaken(const std::string& raw_data) override;
   virtual void OnImageSelected(const std::string& image_url,
                                const std::string& image_type,
-                               bool is_user_selection) OVERRIDE;
-  virtual void OnImageAccepted() OVERRIDE;
-  virtual void OnActorDestroyed(UserImageScreenActor* actor) OVERRIDE;
+                               bool is_user_selection) override;
+  virtual void OnImageAccepted() override;
+  virtual void OnActorDestroyed(UserImageScreenActor* actor) override;
 
-  virtual bool profile_picture_absent() OVERRIDE;
-  virtual int selected_image() OVERRIDE;
-  virtual std::string profile_picture_data_url() OVERRIDE;
+  virtual bool profile_picture_absent() override;
+  virtual int selected_image() override;
+  virtual std::string profile_picture_data_url() override;
 
   // content::NotificationObserver implementation:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
   // ImageDecoder::Delegate implementation:
   virtual void OnImageDecoded(const ImageDecoder* decoder,
-                              const SkBitmap& decoded_image) OVERRIDE;
-  virtual void OnDecodeImageFailed(const ImageDecoder* decoder) OVERRIDE;
+                              const SkBitmap& decoded_image) override;
+  virtual void OnDecodeImageFailed(const ImageDecoder* decoder) override;
 
   // CameraPresenceNotifier::Observer implementation:
-  virtual void OnCameraPresenceCheckDone(bool is_camera_present) OVERRIDE;
+  virtual void OnCameraPresenceCheckDone(bool is_camera_present) override;
 
   // UserImageSyncObserver::Observer implementation:
-  virtual void OnInitialSync(bool local_image_updated) OVERRIDE;
+  virtual void OnInitialSync(bool local_image_updated) override;
 
   bool user_selected_image() const { return user_has_selected_image_; }