chrome/browser/extensions/api/autotest_private/autotest_private_api.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/autotest_private/autotest_private_api.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/activity_log/fullstream_ui_policy_unittest.cc ('k') | chrome/browser/extensions/api/braille_display_private/braille_display_private_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/autotest_private/autotest_private_api.cc

diff --git a/chrome/browser/extensions/api/autotest_private/autotest_private_api.cc b/chrome/browser/extensions/api/autotest_private/autotest_private_api.cc

index e2a12d292b06382a5f33fabfbff47335c3f5cef4..da360aa725cb2a8fb8e9ad4a7ed91b2415064d61 100644

--- a/chrome/browser/extensions/api/autotest_private/autotest_private_api.cc

+++ b/chrome/browser/extensions/api/autotest_private/autotest_private_api.cc

@@ -23,10 +23,10 @@

#if defined(OS_CHROMEOS)

#include "chrome/browser/chromeos/login/lock/screen_locker.h"

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

#include "chromeos/dbus/dbus_thread_manager.h"

#include "chromeos/dbus/session_manager_client.h"

#include "components/user_manager/user.h"

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

#endif

namespace extensions {

@@ -96,7 +96,8 @@ bool AutotestPrivateLoginStatusFunction::RunSync() {

base::DictionaryValue* result(new base::DictionaryValue);

#if defined(OS_CHROMEOS)

- const chromeos::UserManager* user_manager = chromeos::UserManager::Get();

+ const user_manager::UserManager* user_manager =

+ user_manager::UserManager::Get();

const bool is_screen_locked =

!!chromeos::ScreenLocker::default_screen_locker();