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

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

Issue 2937253003: cros: Replace BrowserThread::FILE in InputServiceProxy (Closed)
Patch Set: rebase Created 3 years, 6 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/wizard_controller.h" 5 #include "chrome/browser/chromeos/login/wizard_controller.h"
6 6
7 #include <signal.h> 7 #include <signal.h>
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdlib.h> 9 #include <stdlib.h>
10 #include <sys/types.h> 10 #include <sys/types.h>
(...skipping 14 matching lines...) Expand all
25 #include "base/threading/sequenced_worker_pool.h" 25 #include "base/threading/sequenced_worker_pool.h"
26 #include "base/threading/thread_task_runner_handle.h" 26 #include "base/threading/thread_task_runner_handle.h"
27 #include "chrome/browser/browser_process.h" 27 #include "chrome/browser/browser_process.h"
28 #include "chrome/browser/browser_process_platform_part.h" 28 #include "chrome/browser/browser_process_platform_part.h"
29 #include "chrome/browser/chrome_notification_types.h" 29 #include "chrome/browser/chrome_notification_types.h"
30 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 30 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
31 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" 31 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
32 #include "chrome/browser/chromeos/arc/arc_util.h" 32 #include "chrome/browser/chromeos/arc/arc_util.h"
33 #include "chrome/browser/chromeos/arc/voice_interaction/arc_voice_interaction_fr amework_service.h" 33 #include "chrome/browser/chromeos/arc/voice_interaction/arc_voice_interaction_fr amework_service.h"
34 #include "chrome/browser/chromeos/customization/customization_document.h" 34 #include "chrome/browser/chromeos/customization/customization_document.h"
35 #include "chrome/browser/chromeos/device/input_service_proxy.h"
35 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen. h" 36 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen. h"
36 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.h" 37 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.h"
37 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen.h" 38 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen.h"
38 #include "chrome/browser/chromeos/login/existing_user_controller.h" 39 #include "chrome/browser/chromeos/login/existing_user_controller.h"
39 #include "chrome/browser/chromeos/login/helper.h" 40 #include "chrome/browser/chromeos/login/helper.h"
40 #include "chrome/browser/chromeos/login/hwid_checker.h" 41 #include "chrome/browser/chromeos/login/hwid_checker.h"
41 #include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen.h" 42 #include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen.h"
42 #include "chrome/browser/chromeos/login/screens/device_disabled_screen.h" 43 #include "chrome/browser/chromeos/login/screens/device_disabled_screen.h"
43 #include "chrome/browser/chromeos/login/screens/enable_debugging_screen.h" 44 #include "chrome/browser/chromeos/login/screens/enable_debugging_screen.h"
44 #include "chrome/browser/chromeos/login/screens/encryption_migration_screen.h" 45 #include "chrome/browser/chromeos/login/screens/encryption_migration_screen.h"
(...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after
413 shark_controller_.reset( 414 shark_controller_.reset(
414 new pairing_chromeos::BluetoothControllerPairingController()); 415 new pairing_chromeos::BluetoothControllerPairingController());
415 } 416 }
416 return new ControllerPairingScreen( 417 return new ControllerPairingScreen(
417 this, this, oobe_ui_->GetControllerPairingScreenView(), 418 this, this, oobe_ui_->GetControllerPairingScreenView(),
418 shark_controller_.get()); 419 shark_controller_.get());
419 } else if (screen == OobeScreen::SCREEN_OOBE_HOST_PAIRING) { 420 } else if (screen == OobeScreen::SCREEN_OOBE_HOST_PAIRING) {
420 if (!remora_controller_) { 421 if (!remora_controller_) {
421 remora_controller_.reset( 422 remora_controller_.reset(
422 new pairing_chromeos::BluetoothHostPairingController( 423 new pairing_chromeos::BluetoothHostPairingController(
423 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE))); 424 InputServiceProxy::GetInputServiceTaskRunner()));
424 remora_controller_->StartPairing(); 425 remora_controller_->StartPairing();
425 } 426 }
426 return new HostPairingScreen(this, this, 427 return new HostPairingScreen(this, this,
427 oobe_ui_->GetHostPairingScreenView(), 428 oobe_ui_->GetHostPairingScreenView(),
428 remora_controller_.get()); 429 remora_controller_.get());
429 } else if (screen == OobeScreen::SCREEN_DEVICE_DISABLED) { 430 } else if (screen == OobeScreen::SCREEN_DEVICE_DISABLED) {
430 return new DeviceDisabledScreen(this, 431 return new DeviceDisabledScreen(this,
431 oobe_ui_->GetDeviceDisabledScreenView()); 432 oobe_ui_->GetDeviceDisabledScreenView());
432 } else if (screen == OobeScreen::SCREEN_ENCRYPTION_MIGRATION) { 433 } else if (screen == OobeScreen::SCREEN_ENCRYPTION_MIGRATION) {
433 return new EncryptionMigrationScreen( 434 return new EncryptionMigrationScreen(
(...skipping 1153 matching lines...) Expand 10 before | Expand all | Expand 10 after
1587 } 1588 }
1588 1589
1589 void WizardController::MaybeStartListeningForSharkConnection() { 1590 void WizardController::MaybeStartListeningForSharkConnection() {
1590 // We shouldn't be here if we are running pairing OOBE already. 1591 // We shouldn't be here if we are running pairing OOBE already.
1591 if (IsControllerDetected()) 1592 if (IsControllerDetected())
1592 return; 1593 return;
1593 1594
1594 if (!shark_connection_listener_) { 1595 if (!shark_connection_listener_) {
1595 shark_connection_listener_.reset( 1596 shark_connection_listener_.reset(
1596 new pairing_chromeos::SharkConnectionListener( 1597 new pairing_chromeos::SharkConnectionListener(
1597 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE), 1598 InputServiceProxy::GetInputServiceTaskRunner(),
1598 base::Bind(&WizardController::OnSharkConnected, 1599 base::Bind(&WizardController::OnSharkConnected,
1599 weak_factory_.GetWeakPtr()))); 1600 weak_factory_.GetWeakPtr())));
1600 } 1601 }
1601 } 1602 }
1602 1603
1603 void WizardController::OnSharkConnected( 1604 void WizardController::OnSharkConnected(
1604 std::unique_ptr<pairing_chromeos::HostPairingController> 1605 std::unique_ptr<pairing_chromeos::HostPairingController>
1605 remora_controller) { 1606 remora_controller) {
1606 VLOG(1) << "OnSharkConnected"; 1607 VLOG(1) << "OnSharkConnected";
1607 remora_controller_ = std::move(remora_controller); 1608 remora_controller_ = std::move(remora_controller);
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
1644 SetCurrentScreen(screen); 1645 SetCurrentScreen(screen);
1645 } 1646 }
1646 1647
1647 AutoEnrollmentController* WizardController::GetAutoEnrollmentController() { 1648 AutoEnrollmentController* WizardController::GetAutoEnrollmentController() {
1648 if (!auto_enrollment_controller_) 1649 if (!auto_enrollment_controller_)
1649 auto_enrollment_controller_ = base::MakeUnique<AutoEnrollmentController>(); 1650 auto_enrollment_controller_ = base::MakeUnique<AutoEnrollmentController>();
1650 return auto_enrollment_controller_.get(); 1651 return auto_enrollment_controller_.get();
1651 } 1652 }
1652 1653
1653 } // namespace chromeos 1654 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698