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

Side by Side Diff: chrome/browser/chromeos/login/wizard_controller.cc

Issue 7748041: [cros] WebUI: use correct visibility for StatusArea on boot. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/chromeos/login/webui_login_view.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/wizard_controller.h" 5 #include "chrome/browser/chromeos/login/wizard_controller.h"
6 6
7 #include <gdk/gdk.h> 7 #include <gdk/gdk.h>
8 #include <signal.h> 8 #include <signal.h>
9 #include <sys/types.h> 9 #include <sys/types.h>
10 10
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 WizardController::GetEnterpriseEnrollmentScreen() { 231 WizardController::GetEnterpriseEnrollmentScreen() {
232 if (!enterprise_enrollment_screen_.get()) { 232 if (!enterprise_enrollment_screen_.get()) {
233 enterprise_enrollment_screen_.reset( 233 enterprise_enrollment_screen_.reset(
234 new chromeos::EnterpriseEnrollmentScreen( 234 new chromeos::EnterpriseEnrollmentScreen(
235 this, oobe_display_->GetEnterpriseEnrollmentScreenActor())); 235 this, oobe_display_->GetEnterpriseEnrollmentScreenActor()));
236 } 236 }
237 return enterprise_enrollment_screen_.get(); 237 return enterprise_enrollment_screen_.get();
238 } 238 }
239 239
240 void WizardController::ShowNetworkScreen() { 240 void WizardController::ShowNetworkScreen() {
241 VLOG(1) << "Showing network screen.";
241 SetStatusAreaVisible(false); 242 SetStatusAreaVisible(false);
242 SetCurrentScreen(GetNetworkScreen()); 243 SetCurrentScreen(GetNetworkScreen());
243 host_->SetOobeProgress(chromeos::BackgroundView::SELECT_NETWORK); 244 host_->SetOobeProgress(chromeos::BackgroundView::SELECT_NETWORK);
244 } 245 }
245 246
246 void WizardController::ShowLoginScreen() { 247 void WizardController::ShowLoginScreen() {
248 VLOG(1) << "Showing login screen.";
247 SetStatusAreaVisible(true); 249 SetStatusAreaVisible(true);
248 host_->SetOobeProgress(chromeos::BackgroundView::SIGNIN); 250 host_->SetOobeProgress(chromeos::BackgroundView::SIGNIN);
249 host_->StartSignInScreen(); 251 host_->StartSignInScreen();
250 smooth_show_timer_.Stop(); 252 smooth_show_timer_.Stop();
251 oobe_display_ = NULL; 253 oobe_display_ = NULL;
252 } 254 }
253 255
254 void WizardController::ShowUpdateScreen() { 256 void WizardController::ShowUpdateScreen() {
255 VLOG(1) << "Showing update screen."; 257 VLOG(1) << "Showing update screen.";
256 SetStatusAreaVisible(true); 258 SetStatusAreaVisible(true);
(...skipping 444 matching lines...) Expand 10 before | Expand all | Expand 10 after
701 703
702 bool WizardController::usage_statistics_reporting() const { 704 bool WizardController::usage_statistics_reporting() const {
703 return usage_statistics_reporting_; 705 return usage_statistics_reporting_;
704 } 706 }
705 707
706 void WizardController::SetZeroDelays() { 708 void WizardController::SetZeroDelays() {
707 kShowDelayMs = 0; 709 kShowDelayMs = 0;
708 } 710 }
709 711
710 } // namespace chromeos 712 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/webui_login_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698