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

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

Issue 755203002: Added usage of ScreenContext in EulaScreen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed comments. Created 6 years 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/wizard_controller.h" 5 #include "chrome/browser/chromeos/login/wizard_controller.h"
6 6
7 #include <signal.h> 7 #include <signal.h>
8 #include <stdlib.h> 8 #include <stdlib.h>
9 #include <sys/types.h> 9 #include <sys/types.h>
10 10
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 chromeos::UpdateScreen* result = 300 chromeos::UpdateScreen* result =
301 new chromeos::UpdateScreen(this, 301 new chromeos::UpdateScreen(this,
302 oobe_display_->GetUpdateScreenActor(), 302 oobe_display_->GetUpdateScreenActor(),
303 remora_controller_.get()); 303 remora_controller_.get());
304 result->SetRebootCheckDelay(kWaitForRebootTimeSec); 304 result->SetRebootCheckDelay(kWaitForRebootTimeSec);
305 return result; 305 return result;
306 } else if (screen_name == kUserImageScreenName) { 306 } else if (screen_name == kUserImageScreenName) {
307 return new chromeos::UserImageScreen( 307 return new chromeos::UserImageScreen(
308 this, oobe_display_->GetUserImageScreenActor()); 308 this, oobe_display_->GetUserImageScreenActor());
309 } else if (screen_name == kEulaScreenName) { 309 } else if (screen_name == kEulaScreenName) {
310 return new chromeos::EulaScreen( 310 return new chromeos::EulaScreen(this, this, oobe_display_->GetEulaView());
311 this, this, oobe_display_->GetEulaScreenActor());
312 } else if (screen_name == kEnrollmentScreenName) { 311 } else if (screen_name == kEnrollmentScreenName) {
313 return new chromeos::EnrollmentScreen( 312 return new chromeos::EnrollmentScreen(
314 this, oobe_display_->GetEnrollmentScreenActor()); 313 this, oobe_display_->GetEnrollmentScreenActor());
315 } else if (screen_name == kResetScreenName) { 314 } else if (screen_name == kResetScreenName) {
316 return new chromeos::ResetScreen(this, 315 return new chromeos::ResetScreen(this,
317 oobe_display_->GetResetScreenActor()); 316 oobe_display_->GetResetScreenActor());
318 } else if (screen_name == kEnableDebuggingScreenName) { 317 } else if (screen_name == kEnableDebuggingScreenName) {
319 return new chromeos::EnableDebuggingScreen( 318 return new chromeos::EnableDebuggingScreen(
320 this, 319 this,
321 oobe_display_->GetEnableDebuggingScreenActor()); 320 oobe_display_->GetEnableDebuggingScreenActor());
(...skipping 1036 matching lines...) Expand 10 before | Expand all | Expand 10 after
1358 scoped_ptr<pairing_chromeos::HostPairingController> remora_controller) { 1357 scoped_ptr<pairing_chromeos::HostPairingController> remora_controller) {
1359 VLOG(1) << "OnSharkConnected"; 1358 VLOG(1) << "OnSharkConnected";
1360 remora_controller_ = remora_controller.Pass(); 1359 remora_controller_ = remora_controller.Pass();
1361 base::MessageLoop::current()->DeleteSoon( 1360 base::MessageLoop::current()->DeleteSoon(
1362 FROM_HERE, shark_connection_listener_.release()); 1361 FROM_HERE, shark_connection_listener_.release());
1363 shark_controller_detected_ = true; 1362 shark_controller_detected_ = true;
1364 ShowHostPairingScreen(); 1363 ShowHostPairingScreen();
1365 } 1364 }
1366 1365
1367 } // namespace chromeos 1366 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698