chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.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/extensions/api/runtime/chrome_runtime_api_delegate.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/extensions/api/networking_private/networking_private_apitest.cc ('k') | chrome/browser/extensions/component_loader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc

diff --git a/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc b/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc

index 97098b82305e5383e6184ece52b4bd7a7c90d126..767b44424fa926d8ba6675458beed562c5d008fe 100644

--- a/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc

+++ b/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc

@@ -22,9 +22,9 @@

#include "extensions/common/api/runtime.h"

#if defined(OS_CHROMEOS)

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

#include "chromeos/dbus/dbus_thread_manager.h"

#include "chromeos/dbus/power_manager_client.h"

+#include "components/user_manager/user_manager.h"

#endif

using extensions::Extension;

@@ -226,7 +226,7 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(PlatformInfo* info) {

bool ChromeRuntimeAPIDelegate::RestartDevice(std::string* error_message) {

#if defined(OS_CHROMEOS)

- if (chromeos::UserManager::Get()->IsLoggedInAsKioskApp()) {

+ if (user_manager::UserManager::Get()->IsLoggedInAsKioskApp()) {

chromeos::DBusThreadManager::Get()

->GetPowerManagerClient()

->RequestRestart();