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.

Unified 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h ('K') | « chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc ('k') | chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc » ('j') | chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

index 912335ece2b893169002c5060c012f66645eed05..b37882b45bb86f7f26fa680031713b51c599d0c9 100644

--- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

+++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

@@ -7,9 +7,13 @@

#include "base/command_line.h"

#include "base/logging.h"

#include "base/values.h"

+#include "chrome/browser/browser_process.h"

+#include "chrome/browser/browser_process_platform_part.h"

#include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"

#include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen_actor.h"

#include "chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h"

+#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"

+#include "chrome/browser/chromeos/policy/consumer_management_service.h"

#include "chrome/browser/chromeos/system/input_device_settings.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/ui/webui/about_ui.h"

@@ -256,7 +260,11 @@ OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url)

user_image_screen_actor_ = user_image_screen_handler;

AddScreenHandler(user_image_screen_handler);

- gaia_screen_handler_ = new GaiaScreenHandler(network_state_informer_);

+ 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.

+ g_browser_process->platform_part()->browser_policy_connector_chromeos()->

+ GetConsumerManagementService();

+ gaia_screen_handler_ =

+ new GaiaScreenHandler(network_state_informer_, management_service);

AddScreenHandler(gaia_screen_handler_);

signin_screen_handler_ = new SigninScreenHandler(network_state_informer_,