chrome/browser/ui/webui/options2/chromeos/wallpaper_source.h - Issue 10824006: Revert 148272 - Refactor the wallpaper encoding to another file/class.

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/options2/chromeos/wallpaper_source.h

Issue 10824006: Revert 148272 - Refactor the wallpaper encoding to another file/class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

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

Index: chrome/browser/ui/webui/options2/chromeos/wallpaper_source.h

===================================================================

--- chrome/browser/ui/webui/options2/chromeos/wallpaper_source.h (revision 148277)

+++ chrome/browser/ui/webui/options2/chromeos/wallpaper_source.h (working copy)

@@ -14,9 +14,6 @@

#include "third_party/skia/include/core/SkBitmap.h"

namespace chromeos {

-class SimplePngEncoder;

namespace options2 {

// A DataSource for chrome://wallpaper/ URL, provides current user's wallpaper.

@@ -46,15 +43,12 @@

// Cancel current image encoding operation.

void CancelPendingEncodingOperation();

- // Callback to call if we cancel the wallpaper encode operation.

- void CancelCallback(int request_id);

- // Send image stored in |data| as a reply to request

+ // Send image stored in |data| as a reply to request

// identifed by |request_id|.

void SendCurrentUserWallpaper(int request_id,

scoped_refptr<base::RefCountedBytes> data);

- scoped_refptr<SimplePngEncoder> png_encoder_;

+ scoped_refptr<WallpaperEncodingOperation> wallpaper_encoding_op_;

base::WeakPtrFactory<WallpaperImageSource> weak_ptr_factory_;