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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

Issue 24625003: Delay wallpaper load by 2 * average wallpaper load time. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
6 6
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/chromeos/chromeos_version.h" 8 #include "base/chromeos/chromeos_version.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
(...skipping 1265 matching lines...) Expand 10 before | Expand all | Expand 10 after
1276 UpdateUIState(UI_STATE_GAIA_SIGNIN, NULL); 1276 UpdateUIState(UI_STATE_GAIA_SIGNIN, NULL);
1277 } 1277 }
1278 1278
1279 void SigninScreenHandler::HandleShutdownSystem() { 1279 void SigninScreenHandler::HandleShutdownSystem() {
1280 ash::Shell::GetInstance()->lock_state_controller()->RequestShutdown(); 1280 ash::Shell::GetInstance()->lock_state_controller()->RequestShutdown();
1281 } 1281 }
1282 1282
1283 void SigninScreenHandler::HandleLoadWallpaper(const std::string& email) { 1283 void SigninScreenHandler::HandleLoadWallpaper(const std::string& email) {
1284 if (delegate_) 1284 if (delegate_)
1285 delegate_->LoadWallpaper(email); 1285 delegate_->LoadWallpaper(email);
1286 CallJS("login.AccountPickerScreen.wallpaperLoaded", email);
dzhioev (left Google) 2013/09/26 17:46:41 It should be called after wallpaper was loaded.
Alexander Alekseev 2013/10/16 17:20:27 Done.
1286 } 1287 }
1287 1288
1288 void SigninScreenHandler::HandleRebootSystem() { 1289 void SigninScreenHandler::HandleRebootSystem() {
1289 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->RequestRestart(); 1290 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->RequestRestart();
1290 } 1291 }
1291 1292
1292 void SigninScreenHandler::HandleRemoveUser(const std::string& email) { 1293 void SigninScreenHandler::HandleRemoveUser(const std::string& email) {
1293 if (!delegate_) 1294 if (!delegate_)
1294 return; 1295 return;
1295 delegate_->RemoveUser(email); 1296 delegate_->RemoveUser(email);
(...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after
1772 rvh->ExecuteJavascriptInWebFrame( 1773 rvh->ExecuteJavascriptInWebFrame(
1773 ASCIIToUTF16("//iframe[@id='signin-frame']\n//iframe"), 1774 ASCIIToUTF16("//iframe[@id='signin-frame']\n//iframe"),
1774 ASCIIToUTF16(code)); 1775 ASCIIToUTF16(code));
1775 1776
1776 // Test properties are cleared in HandleCompleteLogin because the form 1777 // Test properties are cleared in HandleCompleteLogin because the form
1777 // submission might fail and login will not be attempted after reloading 1778 // submission might fail and login will not be attempted after reloading
1778 // if they are cleared here. 1779 // if they are cleared here.
1779 } 1780 }
1780 1781
1781 } // namespace chromeos 1782 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698