chrome/browser/chromeos/login/user_image.h - Issue 236013002: Apply default wallpaper from customization manifest.

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/login/user_image.h

Issue 236013002: Apply default wallpaper from customization manifest. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: After-review. Created 6 years, 8 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

« chrome/browser/chromeos/customization_wallpaper_downloader.cc ('K') | « chrome/browser/chromeos/customization_wallpaper_downloader.cc ('k') | chrome/browser/chromeos/login/user_image_loader.h » ('j') | chrome/browser/chromeos/login/user_image_loader.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/user_image.h

diff --git a/chrome/browser/chromeos/login/user_image.h b/chrome/browser/chromeos/login/user_image.h

index b1e39336a38f1aa2222a571486c619714f5918d3..860b2d316c1902b078055f5e11a83cfa1c735ab6 100644

--- a/chrome/browser/chromeos/login/user_image.h

+++ b/chrome/browser/chromeos/login/user_image.h

@@ -5,6 +5,7 @@

#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USER_IMAGE_H_

#define CHROME_BROWSER_CHROMEOS_LOGIN_USER_IMAGE_H_

+#include <string>

#include <vector>

#include "ui/gfx/image/image_skia.h"

@@ -61,6 +62,10 @@ class UserImage {

bool is_safe_format() const { return is_safe_format_; }

void MarkAsSafe();

+ // If image was loaded from local file, file path is stored here.

Daniel Erat 2014/04/14 15:26:15 move this comment down to the member definition in

Alexander Alekseev 2014/04/15 01:57:16 Done.

+ const std::string& file_path() const { return file_path_; }

+ void set_file_path(const std::string& file_path) { file_path_ = file_path; }

private:

gfx::ImageSkia image_;

bool has_raw_image_;

@@ -68,6 +73,7 @@ class UserImage {

bool has_animated_image_;

RawImage animated_image_;

GURL url_;

+ std::string file_path_;

bool is_safe_format_;

};