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

Index: chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc

diff --git a/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc

index e31aa31c30f670b33e1fb2f46cd3db512e77c7fc..c4f599f8530b95b525dbcb7848ad97833a0662de 100644

--- a/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc

+++ b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc

@@ -11,7 +11,6 @@

#include "base/values.h"

#include "chrome/app/chrome_command_ids.h"

#include "chrome/browser/chromeos/input_method/input_method_util.h"

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

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

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

#include "chrome/browser/lifetime/application_lifetime.h"

@@ -25,6 +24,7 @@

#include "chromeos/ime/component_extension_ime_manager.h"

#include "chromeos/ime/extension_ime_util.h"

#include "chromeos/ime/input_method_manager.h"

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

#include "components/user_manager/user_type.h"

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

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

@@ -184,7 +184,7 @@ base::string16 CrosLanguageOptionsHandler::GetProductName() {

void CrosLanguageOptionsHandler::SetApplicationLocale(

const std::string& language_code) {

Profile* profile = Profile::FromWebUI(web_ui());

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

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

// Secondary users and public session users cannot change the locale.

user_manager::User* user = ProfileHelper::Get()->GetUserByProfile(profile);