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

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

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 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <vector> 10 #include <vector>
(...skipping 24 matching lines...) Expand all
35 #include "chrome/browser/chrome_notification_types.h" 35 #include "chrome/browser/chrome_notification_types.h"
36 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" 36 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
37 #include "chrome/browser/chromeos/input_method/input_method_util.h" 37 #include "chrome/browser/chromeos/input_method/input_method_util.h"
38 #include "chrome/browser/chromeos/login/error_screens_histogram_helper.h" 38 #include "chrome/browser/chromeos/login/error_screens_histogram_helper.h"
39 #include "chrome/browser/chromeos/login/hwid_checker.h" 39 #include "chrome/browser/chromeos/login/hwid_checker.h"
40 #include "chrome/browser/chromeos/login/lock/screen_locker.h" 40 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
41 #include "chrome/browser/chromeos/login/lock/webui_screen_locker.h" 41 #include "chrome/browser/chromeos/login/lock/webui_screen_locker.h"
42 #include "chrome/browser/chromeos/login/quick_unlock/pin_storage.h" 42 #include "chrome/browser/chromeos/login/quick_unlock/pin_storage.h"
43 #include "chrome/browser/chromeos/login/quick_unlock/pin_storage_factory.h" 43 #include "chrome/browser/chromeos/login/quick_unlock/pin_storage_factory.h"
44 #include "chrome/browser/chromeos/login/reauth_stats.h" 44 #include "chrome/browser/chromeos/login/reauth_stats.h"
45 #include "chrome/browser/chromeos/login/screens/core_oobe_actor.h" 45 #include "chrome/browser/chromeos/login/screens/core_oobe_view.h"
46 #include "chrome/browser/chromeos/login/screens/network_error.h" 46 #include "chrome/browser/chromeos/login/screens/network_error.h"
47 #include "chrome/browser/chromeos/login/startup_utils.h" 47 #include "chrome/browser/chromeos/login/startup_utils.h"
48 #include "chrome/browser/chromeos/login/ui/login_display_host.h" 48 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
49 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" 49 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
50 #include "chrome/browser/chromeos/login/ui/login_feedback.h" 50 #include "chrome/browser/chromeos/login/ui/login_feedback.h"
51 #include "chrome/browser/chromeos/login/ui/webui_login_display.h" 51 #include "chrome/browser/chromeos/login/ui/webui_login_display.h"
52 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h" 52 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h"
53 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" 53 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
54 #include "chrome/browser/chromeos/login/wizard_controller.h" 54 #include "chrome/browser/chromeos/login/wizard_controller.h"
55 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 55 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 283
284 void LoginScreenContext::Init() { 284 void LoginScreenContext::Init() {
285 oobe_ui_ = false; 285 oobe_ui_ = false;
286 } 286 }
287 287
288 // SigninScreenHandler implementation ------------------------------------------ 288 // SigninScreenHandler implementation ------------------------------------------
289 289
290 SigninScreenHandler::SigninScreenHandler( 290 SigninScreenHandler::SigninScreenHandler(
291 const scoped_refptr<NetworkStateInformer>& network_state_informer, 291 const scoped_refptr<NetworkStateInformer>& network_state_informer,
292 ErrorScreen* error_screen, 292 ErrorScreen* error_screen,
293 CoreOobeActor* core_oobe_actor, 293 CoreOobeView* core_oobe_actor,
Alexander Alekseev 2017/02/22 00:21:05 nit: view ?
jdufault 2017/02/22 01:02:25 Done.
294 GaiaScreenHandler* gaia_screen_handler) 294 GaiaScreenHandler* gaia_screen_handler)
295 : network_state_informer_(network_state_informer), 295 : network_state_informer_(network_state_informer),
296 error_screen_(error_screen), 296 error_screen_(error_screen),
297 core_oobe_actor_(core_oobe_actor), 297 core_oobe_actor_(core_oobe_actor),
298 caps_lock_enabled_(chromeos::input_method::InputMethodManager::Get() 298 caps_lock_enabled_(chromeos::input_method::InputMethodManager::Get()
299 ->GetImeKeyboard() 299 ->GetImeKeyboard()
300 ->CapsLockIsEnabled()), 300 ->CapsLockIsEnabled()),
301 proxy_auth_dialog_reload_times_(kMaxGaiaReloadForProxyAuthDialog), 301 proxy_auth_dialog_reload_times_(kMaxGaiaReloadForProxyAuthDialog),
302 gaia_screen_handler_(gaia_screen_handler), 302 gaia_screen_handler_(gaia_screen_handler),
303 touch_view_binding_(this), 303 touch_view_binding_(this),
(...skipping 1301 matching lines...) Expand 10 before | Expand all | Expand 10 after
1605 if (focused_pod_account_id_) { 1605 if (focused_pod_account_id_) {
1606 std::string user_input_method = 1606 std::string user_input_method =
1607 GetUserLRUInputMethod(focused_pod_account_id_->GetUserEmail()); 1607 GetUserLRUInputMethod(focused_pod_account_id_->GetUserEmail());
1608 EnforcePolicyInputMethods(user_input_method); 1608 EnforcePolicyInputMethods(user_input_method);
1609 } else { 1609 } else {
1610 EnforcePolicyInputMethods(std::string()); 1610 EnforcePolicyInputMethods(std::string());
1611 } 1611 }
1612 } 1612 }
1613 1613
1614 } // namespace chromeos 1614 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698