chrome/browser/chromeos/first_run/first_run_controller.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/chromeos/first_run/first_run_controller.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:

Index: chrome/browser/chromeos/first_run/first_run_controller.cc

diff --git a/chrome/browser/chromeos/first_run/first_run_controller.cc b/chrome/browser/chromeos/first_run/first_run_controller.cc

index 8a8cd4fbf997b787f99ba1b433b4e248d8f3a848..02b8cf18f3bdc038baa9618b612688b698a4fee7 100644

--- a/chrome/browser/chromeos/first_run/first_run_controller.cc

+++ b/chrome/browser/chromeos/first_run/first_run_controller.cc

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

#include "chrome/browser/chromeos/first_run/steps/app_list_step.h"

#include "chrome/browser/chromeos/first_run/steps/help_step.h"

#include "chrome/browser/chromeos/first_run/steps/tray_step.h"

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

#include "chrome/browser/chromeos/profiles/profile_helper.h"

#include "chrome/browser/ui/chrome_pages.h"

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

#include "ui/views/widget/widget.h"

namespace {

@@ -71,7 +71,7 @@ FirstRunController::FirstRunController()

void FirstRunController::Init() {

start_time_ = base::Time::Now();

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

+ user_manager::UserManager* user_manager = user_manager::UserManager::Get();

user_profile_ = ProfileHelper::Get()->GetProfileByUserUnsafe(

user_manager->GetActiveUser());