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

Side by Side Diff: chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.h

Issue 614223006: Revert "UMA: How often are different network error screens encountered during OOBE" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2171
Patch Set: Created 6 years, 2 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_AUTO_ENROLLMENT_CHECK_SCREEN_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_AUTO_ENROLLMENT_CHECK_SCREEN_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_AUTO_ENROLLMENT_CHECK_SCREEN_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_AUTO_ENROLLMENT_CHECK_SCREEN_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen_ actor.h" 11 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen_ actor.h"
12 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.h" 12 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.h"
13 #include "chrome/browser/chromeos/login/screens/error_screen.h" 13 #include "chrome/browser/chromeos/login/screens/error_screen.h"
14 #include "chromeos/network/portal_detector/network_portal_detector.h" 14 #include "chromeos/network/portal_detector/network_portal_detector.h"
15 15
16 namespace chromeos { 16 namespace chromeos {
17 17
18 class ErrorScreensHistogramHelper;
19 class ScreenManager; 18 class ScreenManager;
20 class ScreenObserver; 19 class ScreenObserver;
21 20
22 // Handles the control flow after OOBE auto-update completes to wait for the 21 // Handles the control flow after OOBE auto-update completes to wait for the
23 // enterprise auto-enrollment check that happens as part of OOBE. This includes 22 // enterprise auto-enrollment check that happens as part of OOBE. This includes
24 // keeping track of current auto-enrollment state and displaying and updating 23 // keeping track of current auto-enrollment state and displaying and updating
25 // the error screen upon failures. Similar to a screen controller, but it 24 // the error screen upon failures. Similar to a screen controller, but it
26 // doesn't actually drive a dedicated screen. 25 // doesn't actually drive a dedicated screen.
27 class AutoEnrollmentCheckScreen 26 class AutoEnrollmentCheckScreen
28 : public AutoEnrollmentCheckScreenActor::Delegate, 27 : public AutoEnrollmentCheckScreenActor::Delegate,
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 91
93 AutoEnrollmentCheckScreenActor* actor_; 92 AutoEnrollmentCheckScreenActor* actor_;
94 AutoEnrollmentController* auto_enrollment_controller_; 93 AutoEnrollmentController* auto_enrollment_controller_;
95 94
96 scoped_ptr<AutoEnrollmentController::ProgressCallbackList::Subscription> 95 scoped_ptr<AutoEnrollmentController::ProgressCallbackList::Subscription>
97 auto_enrollment_progress_subscription_; 96 auto_enrollment_progress_subscription_;
98 97
99 NetworkPortalDetector::CaptivePortalStatus captive_portal_status_; 98 NetworkPortalDetector::CaptivePortalStatus captive_portal_status_;
100 policy::AutoEnrollmentState auto_enrollment_state_; 99 policy::AutoEnrollmentState auto_enrollment_state_;
101 100
102 scoped_ptr<ErrorScreensHistogramHelper> histogram_helper_;
103
104 DISALLOW_COPY_AND_ASSIGN(AutoEnrollmentCheckScreen); 101 DISALLOW_COPY_AND_ASSIGN(AutoEnrollmentCheckScreen);
105 }; 102 };
106 103
107 } // namespace chromeos 104 } // namespace chromeos
108 105
109 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_AUTO_ENROLLMENT_CHECK_SCREEN _H_ 106 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_AUTO_ENROLLMENT_CHECK_SCREEN _H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698