OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USER_IMAGE_SCREEN_H_ | 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USER_IMAGE_SCREEN_H_ |
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_USER_IMAGE_SCREEN_H_ | 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_USER_IMAGE_SCREEN_H_ |
7 #pragma once | 7 #pragma once |
8 | 8 |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/time.h" |
10 #include "chrome/browser/chromeos/login/camera_controller.h" | 11 #include "chrome/browser/chromeos/login/camera_controller.h" |
11 #include "chrome/browser/chromeos/login/profile_image_downloader.h" | 12 #include "chrome/browser/chromeos/login/profile_image_downloader.h" |
12 #include "chrome/browser/chromeos/login/user_image_screen_actor.h" | 13 #include "chrome/browser/chromeos/login/user_image_screen_actor.h" |
13 #include "chrome/browser/chromeos/login/wizard_screen.h" | 14 #include "chrome/browser/chromeos/login/wizard_screen.h" |
14 #include "content/public/browser/notification_observer.h" | 15 #include "content/public/browser/notification_observer.h" |
15 #include "content/public/browser/notification_registrar.h" | 16 #include "content/public/browser/notification_registrar.h" |
16 #include "third_party/skia/include/core/SkBitmap.h" | 17 #include "third_party/skia/include/core/SkBitmap.h" |
17 | 18 |
18 namespace chromeos { | 19 namespace chromeos { |
19 | 20 |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
57 void OnNonDefaultImageSelected(const SkBitmap& image, int image_index); | 58 void OnNonDefaultImageSelected(const SkBitmap& image, int image_index); |
58 | 59 |
59 CameraController camera_controller_; | 60 CameraController camera_controller_; |
60 | 61 |
61 content::NotificationRegistrar registrar_; | 62 content::NotificationRegistrar registrar_; |
62 | 63 |
63 UserImageScreenActor* actor_; | 64 UserImageScreenActor* actor_; |
64 | 65 |
65 scoped_ptr<ProfileImageDownloader> profile_image_downloader_; | 66 scoped_ptr<ProfileImageDownloader> profile_image_downloader_; |
66 | 67 |
| 68 // Time when the profile image download has started. |
| 69 base::Time profile_image_load_start_time_; |
| 70 |
67 DISALLOW_COPY_AND_ASSIGN(UserImageScreen); | 71 DISALLOW_COPY_AND_ASSIGN(UserImageScreen); |
68 }; | 72 }; |
69 | 73 |
70 } // namespace chromeos | 74 } // namespace chromeos |
71 | 75 |
72 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_USER_IMAGE_SCREEN_H_ | 76 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_USER_IMAGE_SCREEN_H_ |
OLD | NEW |