chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.cc - Issue 1906773003: Enable SkBitmap to be used by Mojo in Blink

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/ash/launcher/chrome_mash_shelf_controller.cc

Issue 1906773003: Enable SkBitmap to be used by Mojo in Blink (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 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:

Index: chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.cc

diff --git a/chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.cc b/chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.cc

index 1a813c6f1ff5d4a2452a4f205ed4a5ff1874745a..a4a4cc1bbc0b862cce54bdea560bd23940c06191 100644

--- a/chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.cc

+++ b/chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.cc

@@ -78,7 +78,7 @@ void ChromeMashShelfController::Init() {

item->title = "Fake Mojo App (test pinned shelf item)";

ResourceBundle& rb = ResourceBundle::GetSharedInstance();

const gfx::Image& image = rb.GetImageNamed(IDR_PRODUCT_LOGO_32);

- item->image = skia::mojom::Bitmap::From(*image.ToSkBitmap());

+ item->image = blink::mojom::Bitmap::From(*image.ToSkBitmap());

std::unique_ptr<ChromeShelfItemDelegate> delegate(

new ChromeShelfItemDelegate());

shelf_controller_->AddItem(std::move(item),

« no previous file with comments | « chrome/browser/image_decoder.cc ('k') | chrome/common/BUILD.gn » ('j') | no next file with comments »