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

Index: chrome/browser/chromeos/extensions/wallpaper_api.cc

diff --git a/chrome/browser/chromeos/extensions/wallpaper_api.cc b/chrome/browser/chromeos/extensions/wallpaper_api.cc

index 1b1ae37ee34d508898b1ae54207993d4f1b1ea62..e994f2d68da2251c02902cb807f4172dcc57a8ab 100644

--- a/chrome/browser/chromeos/extensions/wallpaper_api.cc

+++ b/chrome/browser/chromeos/extensions/wallpaper_api.cc

@@ -12,13 +12,13 @@

#include "base/strings/stringprintf.h"

#include "base/threading/worker_pool.h"

#include "chrome/browser/browser_process.h"

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

#include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"

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

#include "chrome/common/chrome_paths.h"

#include "chrome/common/extensions/extension_constants.h"

#include "chrome/common/pref_names.h"

#include "components/user_manager/user.h"

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

#include "net/base/load_flags.h"

#include "net/http/http_status_code.h"

#include "net/url_request/url_fetcher.h"

@@ -100,9 +100,9 @@ bool WallpaperSetWallpaperFunction::RunAsync() {

EXTENSION_FUNCTION_VALIDATE(params_);

// Gets email address and username hash while at UI thread.

- user_id_ = chromeos::UserManager::Get()->GetLoggedInUser()->email();

+ user_id_ = user_manager::UserManager::Get()->GetLoggedInUser()->email();

user_id_hash_ =

- chromeos::UserManager::Get()->GetLoggedInUser()->username_hash();

+ user_manager::UserManager::Get()->GetLoggedInUser()->username_hash();

if (params_->details.wallpaper_data) {

StartDecode(*params_->details.wallpaper_data);

@@ -138,7 +138,7 @@ void WallpaperSetWallpaperFunction::OnWallpaperDecoded(

ash::WallpaperLayout layout = wallpaper_api_util::GetLayoutEnum(

set_wallpaper::Params::Details::ToString(params_->details.layout));

bool update_wallpaper =

- user_id_ == chromeos::UserManager::Get()->GetActiveUser()->email();

+ user_id_ == user_manager::UserManager::Get()->GetActiveUser()->email();

wallpaper_manager->SetCustomWallpaper(user_id_,

user_id_hash_,

params_->details.name,