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

Unified Diff: chrome/browser/chromeos/login/wizard_controller.h

Issue 915133002: Revert of HID-detection screen moved to screenContext. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/login/ui/oobe_display.h ('k') | chrome/browser/chromeos/login/wizard_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/wizard_controller.h
diff --git a/chrome/browser/chromeos/login/wizard_controller.h b/chrome/browser/chromeos/login/wizard_controller.h
index fa1f7ad0337b00553cb77c9f3513fc00f51f31c3..ace3c968f3f75e2d2e3681176cb6bb4f5bca9f3c 100644
--- a/chrome/browser/chromeos/login/wizard_controller.h
+++ b/chrome/browser/chromeos/login/wizard_controller.h
@@ -23,7 +23,6 @@
#include "chrome/browser/chromeos/login/screens/base_screen_delegate.h"
#include "chrome/browser/chromeos/login/screens/controller_pairing_screen.h"
#include "chrome/browser/chromeos/login/screens/eula_screen.h"
-#include "chrome/browser/chromeos/login/screens/hid_detection_screen.h"
#include "chrome/browser/chromeos/login/screens/host_pairing_screen.h"
#include "chrome/browser/chromeos/login/screens/network_screen.h"
#include "chrome/browser/chromeos/policy/enrollment_config.h"
@@ -60,8 +59,7 @@
public EulaScreen::Delegate,
public ControllerPairingScreen::Delegate,
public HostPairingScreen::Delegate,
- public NetworkScreen::Delegate,
- public HIDDetectionScreen::Delegate {
+ public NetworkScreen::Delegate {
public:
// Observes screen changes.
class Observer {
@@ -182,6 +180,9 @@
// Shows images login screen.
void ShowLoginScreen(const LoginScreenContext& context);
+
+ // Invokes corresponding first OOBE screen.
+ void OnHIDScreenNecessityCheck(bool screen_needed);
// Exit handlers:
void OnHIDDetectionCompleted();
@@ -256,9 +257,6 @@
// Override from NetworkScreen::Delegate:
void OnEnableDebuggingScreenRequested() override;
- // Override from HIDDetectionScreen::Delegate
- void OnHIDScreenNecessityCheck(bool screen_needed) override;
-
// Notification of a change in the state of an accessibility setting.
void OnAccessibilityStatusChanged(
const AccessibilityStatusEventDetails& details);
@@ -422,8 +420,6 @@
scoped_ptr<pairing_chromeos::SharkConnectionListener>
shark_connection_listener_;
- BaseScreen* hid_screen_;
-
base::WeakPtrFactory<WizardController> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(WizardController);
« no previous file with comments | « chrome/browser/chromeos/login/ui/oobe_display.h ('k') | chrome/browser/chromeos/login/wizard_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698