OLD | NEW |
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 <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
(...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
441 builder->Add("demoLoginMessage", IDS_KIOSK_MODE_LOGIN_MESSAGE); | 441 builder->Add("demoLoginMessage", IDS_KIOSK_MODE_LOGIN_MESSAGE); |
442 | 442 |
443 builder->Add("runType", CommandLine::ForCurrentProcess()->HasSwitch( | 443 builder->Add("runType", CommandLine::ForCurrentProcess()->HasSwitch( |
444 switches::kFirstExecAfterBoot) ? "firstExecAfterBoot" : | 444 switches::kFirstExecAfterBoot) ? "firstExecAfterBoot" : |
445 "notFirstExecAfterBoot"); | 445 "notFirstExecAfterBoot"); |
446 } | 446 } |
447 | 447 |
448 void SigninScreenHandler::Show(const LoginScreenContext& context) { | 448 void SigninScreenHandler::Show(const LoginScreenContext& context) { |
449 CHECK(delegate_); | 449 CHECK(delegate_); |
450 | 450 |
| 451 // Restart fetch if previous attempt failed. |
| 452 ServicesCustomizationDocument::GetInstance()->StartFetching(); |
| 453 |
451 // Just initialize internal fields from context and call ShowImpl(). | 454 // Just initialize internal fields from context and call ShowImpl(). |
452 oobe_ui_ = context.oobe_ui(); | 455 oobe_ui_ = context.oobe_ui(); |
453 if (!context.email().empty()) | 456 if (!context.email().empty()) |
454 email_ = context.email(); | 457 email_ = context.email(); |
455 else | 458 else |
456 email_.clear(); | 459 email_.clear(); |
457 ShowImpl(); | 460 ShowImpl(); |
458 } | 461 } |
459 | 462 |
460 void SigninScreenHandler::ShowRetailModeLoginSpinner() { | 463 void SigninScreenHandler::ShowRetailModeLoginSpinner() { |
(...skipping 1307 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1768 DCHECK(gaia_screen_handler_); | 1771 DCHECK(gaia_screen_handler_); |
1769 return gaia_screen_handler_->frame_state(); | 1772 return gaia_screen_handler_->frame_state(); |
1770 } | 1773 } |
1771 | 1774 |
1772 net::Error SigninScreenHandler::FrameError() const { | 1775 net::Error SigninScreenHandler::FrameError() const { |
1773 DCHECK(gaia_screen_handler_); | 1776 DCHECK(gaia_screen_handler_); |
1774 return gaia_screen_handler_->frame_error(); | 1777 return gaia_screen_handler_->frame_error(); |
1775 } | 1778 } |
1776 | 1779 |
1777 } // namespace chromeos | 1780 } // namespace chromeos |
OLD | NEW |