| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/chromeos/login/screens/update_screen.h" | 5 #include "chrome/browser/chromeos/login/screens/update_screen.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/files/file_util.h" | 10 #include "base/files/file_util.h" |
| (...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 314 if (!network_portal_detector::GetInstance()->IsEnabled()) { | 314 if (!network_portal_detector::GetInstance()->IsEnabled()) { |
| 315 StartUpdateCheck(); | 315 StartUpdateCheck(); |
| 316 return; | 316 return; |
| 317 } | 317 } |
| 318 state_ = STATE_FIRST_PORTAL_CHECK; | 318 state_ = STATE_FIRST_PORTAL_CHECK; |
| 319 is_first_detection_notification_ = true; | 319 is_first_detection_notification_ = true; |
| 320 is_first_portal_notification_ = true; | 320 is_first_portal_notification_ = true; |
| 321 network_portal_detector::GetInstance()->AddAndFireObserver(this); | 321 network_portal_detector::GetInstance()->AddAndFireObserver(this); |
| 322 } | 322 } |
| 323 | 323 |
| 324 void UpdateScreen::PrepareToShow() { | |
| 325 if (!view_) | |
| 326 return; | |
| 327 | |
| 328 view_->PrepareToShow(); | |
| 329 } | |
| 330 | |
| 331 void UpdateScreen::Show() { | 324 void UpdateScreen::Show() { |
| 332 is_shown_ = true; | 325 is_shown_ = true; |
| 333 histogram_helper_->OnScreenShow(); | 326 histogram_helper_->OnScreenShow(); |
| 334 | 327 |
| 335 #if !defined(OFFICIAL_BUILD) | 328 #if !defined(OFFICIAL_BUILD) |
| 336 GetContextEditor().SetBoolean(kContextKeyCancelUpdateShortcutEnabled, true); | 329 GetContextEditor().SetBoolean(kContextKeyCancelUpdateShortcutEnabled, true); |
| 337 #endif | 330 #endif |
| 338 GetContextEditor().SetInteger(kContextKeyProgress, | 331 GetContextEditor().SetInteger(kContextKeyProgress, |
| 339 kBeforeUpdateCheckProgress); | 332 kBeforeUpdateCheckProgress); |
| 340 | 333 |
| (...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 602 } | 595 } |
| 603 | 596 |
| 604 void UpdateScreen::OnConnectRequested() { | 597 void UpdateScreen::OnConnectRequested() { |
| 605 if (state_ == STATE_ERROR) { | 598 if (state_ == STATE_ERROR) { |
| 606 LOG(WARNING) << "Hiding error message since AP was reselected"; | 599 LOG(WARNING) << "Hiding error message since AP was reselected"; |
| 607 StartUpdateCheck(); | 600 StartUpdateCheck(); |
| 608 } | 601 } |
| 609 } | 602 } |
| 610 | 603 |
| 611 } // namespace chromeos | 604 } // namespace chromeos |
| OLD | NEW |