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

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

Issue 438493002: Added ConsumerManagementService class to handle enroll state and device owner info in boot lockbox. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@signin
Patch Set: Only create ConsumerManagementService when --enable-consumer-management is specified. Created 6 years, 4 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) 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 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 5 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/browser/browser_process.h"
11 #include "chrome/browser/browser_process_platform_part.h"
10 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" 12 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
11 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen_ actor.h" 13 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen_ actor.h"
12 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h" 14 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h"
15 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
16 #include "chrome/browser/chromeos/policy/consumer_management_service.h"
13 #include "chrome/browser/chromeos/system/input_device_settings.h" 17 #include "chrome/browser/chromeos/system/input_device_settings.h"
14 #include "chrome/browser/profiles/profile.h" 18 #include "chrome/browser/profiles/profile.h"
15 #include "chrome/browser/ui/webui/about_ui.h" 19 #include "chrome/browser/ui/webui/about_ui.h"
16 #include "chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handle r.h" 20 #include "chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handle r.h"
17 #include "chrome/browser/ui/webui/chromeos/login/auto_enrollment_check_screen_ha ndler.h" 21 #include "chrome/browser/ui/webui/chromeos/login/auto_enrollment_check_screen_ha ndler.h"
18 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h" 22 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
19 #include "chrome/browser/ui/webui/chromeos/login/controller_pairing_screen_handl er.h" 23 #include "chrome/browser/ui/webui/chromeos/login/controller_pairing_screen_handl er.h"
20 #include "chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h" 24 #include "chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h"
21 #include "chrome/browser/ui/webui/chromeos/login/error_screen_handler.h" 25 #include "chrome/browser/ui/webui/chromeos/login/error_screen_handler.h"
22 #include "chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h" 26 #include "chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h"
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 TermsOfServiceScreenHandler* terms_of_service_screen_handler = 253 TermsOfServiceScreenHandler* terms_of_service_screen_handler =
250 new TermsOfServiceScreenHandler(core_handler_); 254 new TermsOfServiceScreenHandler(core_handler_);
251 terms_of_service_screen_actor_ = terms_of_service_screen_handler; 255 terms_of_service_screen_actor_ = terms_of_service_screen_handler;
252 AddScreenHandler(terms_of_service_screen_handler); 256 AddScreenHandler(terms_of_service_screen_handler);
253 257
254 UserImageScreenHandler* user_image_screen_handler = 258 UserImageScreenHandler* user_image_screen_handler =
255 new UserImageScreenHandler(); 259 new UserImageScreenHandler();
256 user_image_screen_actor_ = user_image_screen_handler; 260 user_image_screen_actor_ = user_image_screen_handler;
257 AddScreenHandler(user_image_screen_handler); 261 AddScreenHandler(user_image_screen_handler);
258 262
259 gaia_screen_handler_ = new GaiaScreenHandler(network_state_informer_); 263 policy::ConsumerManagementService* management_service =
bartfab (slow) 2014/08/07 14:32:35 Nit: I suggested renaming |consumer_management| to
davidyu 2014/08/08 03:56:24 Done.
264 g_browser_process->platform_part()->browser_policy_connector_chromeos()->
265 GetConsumerManagementService();
266 gaia_screen_handler_ =
267 new GaiaScreenHandler(network_state_informer_, management_service);
260 AddScreenHandler(gaia_screen_handler_); 268 AddScreenHandler(gaia_screen_handler_);
261 269
262 signin_screen_handler_ = new SigninScreenHandler(network_state_informer_, 270 signin_screen_handler_ = new SigninScreenHandler(network_state_informer_,
263 error_screen_handler_, 271 error_screen_handler_,
264 core_handler_, 272 core_handler_,
265 gaia_screen_handler_); 273 gaia_screen_handler_);
266 AddScreenHandler(signin_screen_handler_); 274 AddScreenHandler(signin_screen_handler_);
267 275
268 AppLaunchSplashScreenHandler* app_launch_splash_screen_handler = 276 AppLaunchSplashScreenHandler* app_launch_splash_screen_handler =
269 new AppLaunchSplashScreenHandler(network_state_informer_, 277 new AppLaunchSplashScreenHandler(network_state_informer_,
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
530 DCHECK(screen_ids_.count(screen)) 538 DCHECK(screen_ids_.count(screen))
531 << "Screen should be registered in InitializeScreenMaps()"; 539 << "Screen should be registered in InitializeScreenMaps()";
532 Screen new_screen = screen_ids_[screen]; 540 Screen new_screen = screen_ids_[screen];
533 FOR_EACH_OBSERVER(Observer, 541 FOR_EACH_OBSERVER(Observer,
534 observer_list_, 542 observer_list_,
535 OnCurrentScreenChanged(current_screen_, new_screen)); 543 OnCurrentScreenChanged(current_screen_, new_screen));
536 current_screen_ = new_screen; 544 current_screen_ = new_screen;
537 } 545 }
538 546
539 } // namespace chromeos 547 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698