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

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

Issue 2700303002: cros: Unify oobe View/Actor naming to just View. (Closed)
Patch Set: Created 3 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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_SIGNIN_SCREEN_HANDLER_H_ 5 #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_SIGNIN_SCREEN_HANDLER_H_
6 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_SIGNIN_SCREEN_HANDLER_H_ 6 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_SIGNIN_SCREEN_HANDLER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory> 9 #include <memory>
10 #include <set> 10 #include <set>
(...skipping 28 matching lines...) Expand all
39 39
40 class AccountId; 40 class AccountId;
41 41
42 namespace base { 42 namespace base {
43 class DictionaryValue; 43 class DictionaryValue;
44 class ListValue; 44 class ListValue;
45 } 45 }
46 46
47 namespace chromeos { 47 namespace chromeos {
48 48
49 class CoreOobeActor; 49 class CoreOobeView;
50 class ErrorScreensHistogramHelper; 50 class ErrorScreensHistogramHelper;
51 class GaiaScreenHandler; 51 class GaiaScreenHandler;
52 class LoginFeedback; 52 class LoginFeedback;
53 class NativeWindowDelegate; 53 class NativeWindowDelegate;
54 class SupervisedUserCreationScreenHandler; 54 class SupervisedUserCreationScreenHandler;
55 class User; 55 class User;
56 class UserContext; 56 class UserContext;
57 57
58 // Helper class to pass initial parameters to the login screen. 58 // Helper class to pass initial parameters to the login screen.
59 class LoginScreenContext { 59 class LoginScreenContext {
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 public content::NotificationObserver, 223 public content::NotificationObserver,
224 public NetworkStateInformer::NetworkStateInformerObserver, 224 public NetworkStateInformer::NetworkStateInformerObserver,
225 public PowerManagerClient::Observer, 225 public PowerManagerClient::Observer,
226 public input_method::ImeKeyboard::Observer, 226 public input_method::ImeKeyboard::Observer,
227 public ash::mojom::TouchViewObserver, 227 public ash::mojom::TouchViewObserver,
228 public OobeUI::Observer { 228 public OobeUI::Observer {
229 public: 229 public:
230 SigninScreenHandler( 230 SigninScreenHandler(
231 const scoped_refptr<NetworkStateInformer>& network_state_informer, 231 const scoped_refptr<NetworkStateInformer>& network_state_informer,
232 ErrorScreen* error_screen, 232 ErrorScreen* error_screen,
233 CoreOobeActor* core_oobe_actor, 233 CoreOobeView* core_oobe_actor,
Alexander Alekseev 2017/02/22 00:21:05 nit: view ?
jdufault 2017/02/22 01:02:25 Done.
234 GaiaScreenHandler* gaia_screen_handler); 234 GaiaScreenHandler* gaia_screen_handler);
235 ~SigninScreenHandler() override; 235 ~SigninScreenHandler() override;
236 236
237 static std::string GetUserLRUInputMethod(const std::string& username); 237 static std::string GetUserLRUInputMethod(const std::string& username);
238 238
239 // Update current input method (namely keyboard layout) in the given IME state 239 // Update current input method (namely keyboard layout) in the given IME state
240 // to LRU by this user. 240 // to LRU by this user.
241 static void SetUserInputMethod( 241 static void SetUserInputMethod(
242 const std::string& username, 242 const std::string& username,
243 input_method::InputMethodManager::State* ime_state); 243 input_method::InputMethodManager::State* ime_state);
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
460 bool is_account_picker_showing_first_time_ = false; 460 bool is_account_picker_showing_first_time_ = false;
461 461
462 // Network state informer used to keep signin screen up. 462 // Network state informer used to keep signin screen up.
463 scoped_refptr<NetworkStateInformer> network_state_informer_; 463 scoped_refptr<NetworkStateInformer> network_state_informer_;
464 464
465 // Set to true once |LOGIN_WEBUI_VISIBLE| notification is observed. 465 // Set to true once |LOGIN_WEBUI_VISIBLE| notification is observed.
466 bool webui_visible_ = false; 466 bool webui_visible_ = false;
467 bool preferences_changed_delayed_ = false; 467 bool preferences_changed_delayed_ = false;
468 468
469 ErrorScreen* error_screen_ = nullptr; 469 ErrorScreen* error_screen_ = nullptr;
470 CoreOobeActor* core_oobe_actor_ = nullptr; 470 CoreOobeView* core_oobe_actor_ = nullptr;
Alexander Alekseev 2017/02/22 00:21:05 nit: view ?
jdufault 2017/02/22 01:02:25 Done.
471 471
472 NetworkStateInformer::State last_network_state_ = 472 NetworkStateInformer::State last_network_state_ =
473 NetworkStateInformer::UNKNOWN; 473 NetworkStateInformer::UNKNOWN;
474 474
475 base::CancelableClosure update_state_closure_; 475 base::CancelableClosure update_state_closure_;
476 base::CancelableClosure connecting_closure_; 476 base::CancelableClosure connecting_closure_;
477 477
478 content::NotificationRegistrar registrar_; 478 content::NotificationRegistrar registrar_;
479 479
480 std::unique_ptr<CrosSettings::ObserverSubscription> 480 std::unique_ptr<CrosSettings::ObserverSubscription>
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
527 std::unique_ptr<AccountId> focused_pod_account_id_; 527 std::unique_ptr<AccountId> focused_pod_account_id_;
528 528
529 base::WeakPtrFactory<SigninScreenHandler> weak_factory_; 529 base::WeakPtrFactory<SigninScreenHandler> weak_factory_;
530 530
531 DISALLOW_COPY_AND_ASSIGN(SigninScreenHandler); 531 DISALLOW_COPY_AND_ASSIGN(SigninScreenHandler);
532 }; 532 };
533 533
534 } // namespace chromeos 534 } // namespace chromeos
535 535
536 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_SIGNIN_SCREEN_HANDLER_H_ 536 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_SIGNIN_SCREEN_HANDLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698