chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_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/chromeos/login/terms_of_service_screen_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/chromeos/login/supervised_user_creation_screen_handler.cc ('k') | chrome/browser/ui/webui/chromeos/ui_account_tweaks.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc

diff --git a/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc

index 8bf028754d98aa3a24f4cec7e2f947fdfcd508a6..898827ba93709bdd583677f1ea5b0841aad59918 100644

--- a/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc

+++ b/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc

@@ -15,13 +15,14 @@

#include "chrome/browser/browser_process.h"

#include "chrome/browser/chromeos/base/locale_util.h"

#include "chrome/browser/chromeos/login/screens/core_oobe_actor.h"

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

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

#include "chrome/browser/profiles/profile.h"

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

#include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"

#include "chrome/common/pref_names.h"

#include "chromeos/ime/input_method_manager.h"

#include "components/user_manager/user.h"

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

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

#include "grit/chromium_strings.h"

#include "grit/generated_resources.h"

@@ -84,9 +85,11 @@ void TermsOfServiceScreenHandler::Show() {

const std::string locale =

ProfileHelper::Get()

- ->GetProfileByUserUnsafe(UserManager::Get()->GetActiveUser())

+ ->GetProfileByUserUnsafe(

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

->GetPrefs()

->GetString(prefs::kApplicationLocale);

if (locale.empty() || locale == g_browser_process->GetApplicationLocale()) {

// If the user has not chosen a UI locale yet or the chosen locale matches

// the current UI locale, show the screen immediately.

@@ -151,7 +154,8 @@ void TermsOfServiceScreenHandler::DoShow() {

std::vector<std::string> input_methods;

base::SplitString(

ProfileHelper::Get()

- ->GetProfileByUserUnsafe(UserManager::Get()->GetActiveUser())

+ ->GetProfileByUserUnsafe(

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

->GetPrefs()

->GetString(prefs::kLanguagePreloadEngines),

',',