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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h

Issue 740973002: Fixed UI stuck on Network screen after rebooting on FRE screen (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « no previous file | chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.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 (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 #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_ENROLLMENT_SCREEN_HANDLER_H_ 5 #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_ENROLLMENT_SCREEN_HANDLER_H_
6 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_ENROLLMENT_SCREEN_HANDLER_H_ 6 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_ENROLLMENT_SCREEN_HANDLER_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "base/callback_forward.h" 12 #include "base/callback_forward.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/memory/scoped_vector.h" 14 #include "base/memory/scoped_vector.h"
15 #include "chrome/browser/browsing_data/browsing_data_remover.h" 15 #include "chrome/browser/browsing_data/browsing_data_remover.h"
16 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h" 16 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h"
17 #include "chrome/browser/chromeos/login/ui/webui_login_view.h" 17 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"
18 #include "chrome/browser/extensions/signin/scoped_gaia_auth_extension.h"
18 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h" 19 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
19 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h" 20 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h"
20 21
21 namespace policy { 22 namespace policy {
22 class PolicyOAuth2TokenFetcher; 23 class PolicyOAuth2TokenFetcher;
23 } 24 }
24 25
25 namespace chromeos { 26 namespace chromeos {
26 27
27 class ErrorScreensHistogramHelper; 28 class ErrorScreensHistogramHelper;
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 // Latest enrollment frame error. 142 // Latest enrollment frame error.
142 net::Error frame_error_; 143 net::Error frame_error_;
143 144
144 // Network state informer used to keep signin screen up. 145 // Network state informer used to keep signin screen up.
145 scoped_refptr<NetworkStateInformer> network_state_informer_; 146 scoped_refptr<NetworkStateInformer> network_state_informer_;
146 147
147 ErrorScreenActor* error_screen_actor_; 148 ErrorScreenActor* error_screen_actor_;
148 149
149 scoped_ptr<ErrorScreensHistogramHelper> histogram_helper_; 150 scoped_ptr<ErrorScreensHistogramHelper> histogram_helper_;
150 151
152 // GAIA extension loader.
153 scoped_ptr<ScopedGaiaAuthExtension> auth_extension_;
154
151 base::WeakPtrFactory<EnrollmentScreenHandler> weak_ptr_factory_; 155 base::WeakPtrFactory<EnrollmentScreenHandler> weak_ptr_factory_;
152 156
153 DISALLOW_COPY_AND_ASSIGN(EnrollmentScreenHandler); 157 DISALLOW_COPY_AND_ASSIGN(EnrollmentScreenHandler);
154 }; 158 };
155 159
156 } // namespace chromeos 160 } // namespace chromeos
157 161
158 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_ENROLLMENT_SCREEN_HANDLER_H_ 162 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_ENROLLMENT_SCREEN_HANDLER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698