chrome/browser/chromeos/first_run/first_run.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.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/chromeos/first_run/drive_first_run_controller.cc ('k') | chrome/browser/chromeos/first_run/first_run_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index c3e73e955a591b4415521782279020f05a071d53..bf2d00756fcf13aa445709a26f292d534e60d5da 100644

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

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

@@ -5,16 +5,18 @@

#include "base/command_line.h"

#include "base/metrics/histogram.h"

#include "base/prefs/pref_service.h"

+#include "chrome/browser/browser_process.h"

#include "chrome/browser/chrome_notification_types.h"

#include "chrome/browser/chromeos/first_run/first_run_controller.h"

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

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

#include "chrome/browser/extensions/extension_service.h"

+#include "chrome/browser/profiles/profile_manager.h"

#include "chrome/browser/ui/extensions/application_launch.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/pref_names.h"

#include "chromeos/chromeos_switches.h"

#include "components/pref_registry/pref_registry_syncable.h"

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

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

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

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

@@ -67,7 +69,7 @@ class DialogLauncher : public content::NotificationObserver {

bool launched_in_test = command_line->HasSwitch(::switches::kTestType);

bool launched_in_telemetry =

command_line->HasSwitch(switches::kOobeSkipPostLogin);

- bool is_user_new = chromeos::UserManager::Get()->IsCurrentUserNew();

+ bool is_user_new = user_manager::UserManager::Get()->IsCurrentUserNew();

bool first_run_forced = command_line->HasSwitch(switches::kForceFirstRunUI);

bool first_run_seen =

profile_->GetPrefs()->GetBoolean(prefs::kFirstRunTutorialShown);

@@ -96,9 +98,8 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {

}

void MaybeLaunchDialogAfterSessionStart() {

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

new DialogLauncher(ProfileHelper::Get()->GetProfileByUserUnsafe(

- user_manager->GetActiveUser()));

+ user_manager::UserManager::Get()->GetActiveUser()));

}

void LaunchTutorial() {