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

Side by Side Diff: chrome/browser/chromeos/login/screens/update_screen.cc

Issue 2566443005: cros: Replace WizardController string constants with OobeScreen values. (Closed)
Patch Set: Address comments Created 3 years, 11 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) 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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 // static 97 // static
98 bool UpdateScreen::HasInstance(UpdateScreen* inst) { 98 bool UpdateScreen::HasInstance(UpdateScreen* inst) {
99 InstanceSet& instance_set = GetInstanceSet(); 99 InstanceSet& instance_set = GetInstanceSet();
100 InstanceSet::iterator found = instance_set.find(inst); 100 InstanceSet::iterator found = instance_set.find(inst);
101 return (found != instance_set.end()); 101 return (found != instance_set.end());
102 } 102 }
103 103
104 // static 104 // static
105 UpdateScreen* UpdateScreen::Get(ScreenManager* manager) { 105 UpdateScreen* UpdateScreen::Get(ScreenManager* manager) {
106 return static_cast<UpdateScreen*>( 106 return static_cast<UpdateScreen*>(
107 manager->GetScreen(WizardController::kUpdateScreenName)); 107 manager->GetScreen(OobeScreen::SCREEN_OOBE_UPDATE));
108 } 108 }
109 109
110 UpdateScreen::UpdateScreen(BaseScreenDelegate* base_screen_delegate, 110 UpdateScreen::UpdateScreen(BaseScreenDelegate* base_screen_delegate,
111 UpdateView* view, 111 UpdateView* view,
112 HostPairingController* remora_controller) 112 HostPairingController* remora_controller)
113 : UpdateModel(base_screen_delegate), 113 : UpdateModel(base_screen_delegate),
114 state_(STATE_IDLE), 114 state_(STATE_IDLE),
115 reboot_check_delay_(kWaitForRebootTimeSec), 115 reboot_check_delay_(kWaitForRebootTimeSec),
116 is_checking_for_update_(true), 116 is_checking_for_update_(true),
117 is_downloading_update_(false), 117 is_downloading_update_(false),
(...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after
595 } 595 }
596 596
597 void UpdateScreen::OnConnectRequested() { 597 void UpdateScreen::OnConnectRequested() {
598 if (state_ == STATE_ERROR) { 598 if (state_ == STATE_ERROR) {
599 LOG(WARNING) << "Hiding error message since AP was reselected"; 599 LOG(WARNING) << "Hiding error message since AP was reselected";
600 StartUpdateCheck(); 600 StartUpdateCheck();
601 } 601 }
602 } 602 }
603 603
604 } // namespace chromeos 604 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698