chrome/browser/ui/webui/options/chromeos/consumer_management_handler.cc - Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/options/chromeos/consumer_management_handler.cc

Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase 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

« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc ('k') | chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc » ('j') | no next file with comments »
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 8acec3a6beaa80e58579b50d4f520dfa9ecf52c8..d1d904429b8721969db6db1a9e8a662a549c3483 100644

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

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

@@ -8,10 +8,10 @@

#include "base/bind_helpers.h"

#include "base/logging.h"

#include "base/values.h"

-#include "chrome/browser/chromeos/login/users/user_manager.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 "components/user_manager/user_manager.h"

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

#include "grit/generated_resources.h"

#include "ui/base/l10n/l10n_util.h"

@@ -77,7 +77,7 @@ void ConsumerManagementHandler::RegisterMessages() {

void ConsumerManagementHandler::HandleEnrollConsumerManagement(

const base::ListValue* args) {

- if (!chromeos::UserManager::Get()->IsCurrentUserOwner()) {

+ if (!user_manager::UserManager::Get()->IsCurrentUserOwner()) {

LOG(ERROR) << "Received enrollConsumerManagement, but the current user is "

<< "not the owner.";

return;