chrome/browser/ui/webui/options/chromeos/consumer_management_handler.cc - Issue 438493002: Added ConsumerManagementService class to handle enroll state and device owner info in boot lockbox.

Unified Diff: chrome/browser/ui/webui/options/chromeos/consumer_management_handler.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: Call FlushAndSignBootAttributes() in SetOwner(). 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/signin_screen_handler.cc ('K') | « chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | chrome/common/pref_names.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/chromeos/consumer_management_handler.cc

diff --git a/chrome/browser/ui/webui/options/chromeos/consumer_management_handler.cc b/chrome/browser/ui/webui/options/chromeos/consumer_management_handler.cc

index e106c58df3198d47c1b406dbd9c2aa4931532552..e15fe295680dc0dcfb0f53aff07e3cec7d529f13 100644

--- a/chrome/browser/ui/webui/options/chromeos/consumer_management_handler.cc

+++ b/chrome/browser/ui/webui/options/chromeos/consumer_management_handler.cc

@@ -7,11 +7,11 @@

#include "base/bind.h"

#include "base/bind_helpers.h"

#include "base/logging.h"

-#include "base/prefs/pref_service.h"

#include "base/values.h"

#include "chrome/browser/browser_process.h"

#include "chrome/browser/chromeos/login/users/user_manager.h"

-#include "chrome/common/pref_names.h"

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

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

#include "chromeos/dbus/dbus_thread_manager.h"

#include "chromeos/dbus/power_manager_client.h"

#include "content/public/browser/web_ui.h"

@@ -83,9 +83,10 @@ void ConsumerManagementHandler::HandleEnrollConsumerManagement(

return;

}

- PrefService* prefs = g_browser_process->local_state();

- prefs->SetBoolean(prefs::kConsumerManagementEnrollmentRequested, true);

- prefs->CommitPendingWrite();

+ policy::BrowserPolicyConnectorChromeOS* connector =

bartfab (slow) 2014/08/04 18:44:57 See my comment in gaia_screen_handler.cc regarding

davidyu 2014/08/05 07:27:01 Done.

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

bartfab (slow) 2014/08/04 18:44:56 Nit 1: Indent two more spaces. Nit 2: #include "ch

davidyu 2014/08/05 07:27:01 Done.

+ connector->GetConsumerManagementService()->SetEnrollState(

+ policy::ConsumerManagementService::ENROLL_ENROLLING);

chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->RequestRestart();

}