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

Side by Side Diff: chrome/browser/chromeos/login/supervised/supervised_user_creation_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
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_SUPERVISED_SUPERVISED_USER_CREATION_SCREEN _H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_CREATION_SCREEN _H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_CREATION_SCREEN _H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_CREATION_SCREEN _H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "chrome/browser/chromeos/camera_presence_notifier.h" 12 #include "chrome/browser/chromeos/camera_presence_notifier.h"
13 #include "chrome/browser/chromeos/login/screens/wizard_screen.h" 13 #include "chrome/browser/chromeos/login/screens/wizard_screen.h"
14 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_cont roller.h" 14 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_cont roller.h"
15 #include "chrome/browser/image_decoder.h" 15 #include "chrome/browser/image_decoder.h"
16 #include "chrome/browser/supervised_user/supervised_user_sync_service.h" 16 #include "chrome/browser/supervised_user/supervised_user_sync_service.h"
17 #include "chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen _handler.h" 17 #include "chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen _handler.h"
18 #include "chromeos/network/portal_detector/network_portal_detector.h" 18 #include "chromeos/network/portal_detector/network_portal_detector.h"
19 #include "ui/gfx/image/image_skia.h" 19 #include "ui/gfx/image/image_skia.h"
20 20
21 class Profile; 21 class Profile;
22 22
23 namespace chromeos { 23 namespace chromeos {
24 24
25 class ErrorScreensHistogramHelper;
26 class NetworkState; 25 class NetworkState;
27 class ScreenManager; 26 class ScreenManager;
28 27
29 // Class that controls screen showing ui for supervised user creation. 28 // Class that controls screen showing ui for supervised user creation.
30 class SupervisedUserCreationScreen 29 class SupervisedUserCreationScreen
31 : public WizardScreen, 30 : public WizardScreen,
32 public SupervisedUserCreationScreenHandler::Delegate, 31 public SupervisedUserCreationScreenHandler::Delegate,
33 public SupervisedUserCreationController::StatusConsumer, 32 public SupervisedUserCreationController::StatusConsumer,
34 public SupervisedUserSyncServiceObserver, 33 public SupervisedUserSyncServiceObserver,
35 public ImageDecoder::Delegate, 34 public ImageDecoder::Delegate,
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 bool manager_signin_in_progress_; 137 bool manager_signin_in_progress_;
139 std::string last_page_; 138 std::string last_page_;
140 139
141 SupervisedUserSyncService* sync_service_; 140 SupervisedUserSyncService* sync_service_;
142 141
143 gfx::ImageSkia user_photo_; 142 gfx::ImageSkia user_photo_;
144 scoped_refptr<ImageDecoder> image_decoder_; 143 scoped_refptr<ImageDecoder> image_decoder_;
145 bool apply_photo_after_decoding_; 144 bool apply_photo_after_decoding_;
146 int selected_image_; 145 int selected_image_;
147 146
148 scoped_ptr<ErrorScreensHistogramHelper> histogram_helper_;
149
150 base::WeakPtrFactory<SupervisedUserCreationScreen> weak_factory_; 147 base::WeakPtrFactory<SupervisedUserCreationScreen> weak_factory_;
151 148
152 DISALLOW_COPY_AND_ASSIGN(SupervisedUserCreationScreen); 149 DISALLOW_COPY_AND_ASSIGN(SupervisedUserCreationScreen);
153 }; 150 };
154 151
155 } // namespace chromeos 152 } // namespace chromeos
156 153
157 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_CREATION_SCR EEN_H_ 154 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_CREATION_SCR EEN_H_
158 155
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698