ash/mus/shelf_delegate_mus.h - Issue 2014013002: Add SkBitmap StructTraits for skia::mojo::Bitmap.

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: ash/mus/shelf_delegate_mus.h

Issue 2014013002: Add SkBitmap StructTraits for skia::mojo::Bitmap. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix return build errors. Created 4 years, 7 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:

Index: ash/mus/shelf_delegate_mus.h

diff --git a/ash/mus/shelf_delegate_mus.h b/ash/mus/shelf_delegate_mus.h

index 40a282338380e4f3b5c4a625536aa9515a925b6c..ea6635debfce8b952eac4c6071e7970f4cb0e18c 100644

--- a/ash/mus/shelf_delegate_mus.h

+++ b/ash/mus/shelf_delegate_mus.h

@@ -54,8 +54,7 @@ class ShelfDelegateMus : public ShelfDelegate,

mash::shelf::mojom::ShelfItemPtr item,

mash::shelf::mojom::ShelfItemDelegateAssociatedPtrInfo delegate) override;

void UnpinItem(const mojo::String& app_id) override;

- void SetItemImage(const mojo::String& app_id,

- skia::mojom::BitmapPtr image) override;

+ void SetItemImage(const mojo::String& app_id, const SkBitmap& image) override;

// mash::wm::mojom::UserWindowObserver:

void OnUserWindowObserverAdded(