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

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

Issue 679133002: ScreenObserver is renamed to BaseScreenDelegate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes. Created 6 years, 1 month 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 921 matching lines...) Expand 10 before | Expand all | Expand 10 after
932 } else { 932 } else {
933 ShowNetworkScreen(); 933 ShowNetworkScreen();
934 } 934 }
935 } else { 935 } else {
936 ShowLoginScreen(LoginScreenContext()); 936 ShowLoginScreen(LoginScreenContext());
937 } 937 }
938 } 938 }
939 } 939 }
940 940
941 /////////////////////////////////////////////////////////////////////////////// 941 ///////////////////////////////////////////////////////////////////////////////
942 // WizardController, chromeos::ScreenObserver overrides: 942 // WizardController, chromeos::BaseScreenDelegate overrides:
943 void WizardController::OnExit(ExitCodes exit_code) { 943 void WizardController::OnExit(ExitCodes exit_code) {
944 VLOG(1) << "Wizard screen exit code: " << exit_code; 944 VLOG(1) << "Wizard screen exit code: " << exit_code;
945 std::string previous_screen_id = current_screen_->GetName(); 945 std::string previous_screen_id = current_screen_->GetName();
946 if (IsOOBEStepToTrack(previous_screen_id)) { 946 if (IsOOBEStepToTrack(previous_screen_id)) {
947 RecordUMAHistogramForOOBEStepCompletionTime( 947 RecordUMAHistogramForOOBEStepCompletionTime(
948 previous_screen_id, 948 previous_screen_id,
949 base::Time::Now() - screen_show_times_[previous_screen_id]); 949 base::Time::Now() - screen_show_times_[previous_screen_id]);
950 } 950 }
951 switch (exit_code) { 951 switch (exit_code) {
952 case HID_DETECTION_COMPLETED: 952 case HID_DETECTION_COMPLETED:
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
1300 scoped_ptr<pairing_chromeos::HostPairingController> remora_controller) { 1300 scoped_ptr<pairing_chromeos::HostPairingController> remora_controller) {
1301 VLOG(1) << "OnSharkConnected"; 1301 VLOG(1) << "OnSharkConnected";
1302 remora_controller_ = remora_controller.Pass(); 1302 remora_controller_ = remora_controller.Pass();
1303 base::MessageLoop::current()->DeleteSoon( 1303 base::MessageLoop::current()->DeleteSoon(
1304 FROM_HERE, shark_connection_listener_.release()); 1304 FROM_HERE, shark_connection_listener_.release());
1305 shark_controller_detected_ = true; 1305 shark_controller_detected_ = true;
1306 ShowHostPairingScreen(); 1306 ShowHostPairingScreen();
1307 } 1307 }
1308 1308
1309 } // namespace chromeos 1309 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/wizard_controller.h ('k') | chrome/browser/chromeos/login/wizard_controller_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698