chrome/browser/ui/webui/options/chromeos/user_image_source.h - Issue 1425093004: Revert of This CL replaces user_manager::UserID with AccountId.

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/user_image_source.h

Issue 1425093004: Revert of This CL replaces user_manager::UserID with AccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@468875--Chrome-OS-handles-deletion-of-Gmail-account-poorly--Create-AccountID-structure-part2--user_names

Patch Set: Created 5 years, 2 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/shared_options_browsertest.cc ('k') | chrome/browser/ui/webui/options/chromeos/user_image_source.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/chromeos/user_image_source.h

diff --git a/chrome/browser/ui/webui/options/chromeos/user_image_source.h b/chrome/browser/ui/webui/options/chromeos/user_image_source.h

index 87ffa1266f912a22930ee0da6b6d2908ff9aebb6..ad11d6ada99bf08677de41ef81aee63083e5e448 100644

--- a/chrome/browser/ui/webui/options/chromeos/user_image_source.h

+++ b/chrome/browser/ui/webui/options/chromeos/user_image_source.h

@@ -12,8 +12,6 @@

#include "base/compiler_specific.h"

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

#include "ui/base/layout.h"

-class AccountId;

namespace base {

class RefCountedMemory;

@@ -37,9 +35,9 @@

const content::URLDataSource::GotDataCallback& callback) override;

std::string GetMimeType(const std::string& path) const override;

- // Returns PNG encoded image for user with specified |account_id|. If there's

- // no user with such an id, returns the first default image.

- static base::RefCountedMemory* GetUserImage(const AccountId& account_id,

+ // Returns PNG encoded image for user with specified email. If there's

+ // no user with such email, returns the first default image.

+ static base::RefCountedMemory* GetUserImage(const std::string& email,

ui::ScaleFactor scale_factor);

private: