Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(727)

Unified Diff: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h

Issue 24625003: Delay wallpaper load by 2 * average wallpaper load time. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Catch WallpaperAnimationFinished event and inform JS. Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h
index 6f977d14fe9399c197eaac85d43754e03b3502d9..de83887e2bebc39515398291c3e05335e6b48b54 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h
@@ -17,6 +17,7 @@
#include "chrome/browser/chromeos/login/login_display.h"
#include "chrome/browser/chromeos/login/screens/error_screen_actor.h"
#include "chrome/browser/chromeos/login/user_manager.h"
+#include "chrome/browser/chromeos/login/wallpaper_manager.h"
#include "chrome/browser/chromeos/net/network_portal_detector.h"
#include "chrome/browser/chromeos/settings/cros_settings.h"
#include "chrome/browser/chromeos/system_key_event_listener.h"
@@ -173,7 +174,8 @@ class SigninScreenHandler
public LoginDisplayWebUIHandler,
public SystemKeyEventListener::CapsLockObserver,
public content::NotificationObserver,
- public NetworkStateInformer::NetworkStateInformerObserver {
+ public NetworkStateInformer::NetworkStateInformerObserver,
+ public WallpaperManager::Observer {
public:
SigninScreenHandler(
const scoped_refptr<NetworkStateInformer>& network_state_informer,
@@ -201,6 +203,9 @@ class SigninScreenHandler
// Required Local State preferences.
static void RegisterPrefs(PrefRegistrySimple* registry);
+ // From WallpaperManager::Observer
+ void OnWallpaperAnimationFinished(const std::string& email) OVERRIDE;
+
private:
enum UIState {
UI_STATE_UNKNOWN = 0,
@@ -450,6 +455,8 @@ class SigninScreenHandler
base::WeakPtrFactory<SigninScreenHandler> weak_factory_;
+ base::WeakPtrFactory<WallpaperManager::Observer> weak_factory_as_observer_;
+
// Set to true once |LOGIN_WEBUI_VISIBLE| notification is observed.
bool webui_visible_;
bool preferences_changed_delayed_;

Powered by Google App Engine
This is Rietveld 408576698