chrome/browser/ui/toolbar/media_router_action.h - Issue 1214243003: [Extensions UI] Clean up extension icon generation

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/toolbar/media_router_action.h

Issue 1214243003: [Extensions UI] Clean up extension icon generation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: s/skia/ImageSkia Created 5 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:

Index: chrome/browser/ui/toolbar/media_router_action.h

diff --git a/chrome/browser/ui/toolbar/media_router_action.h b/chrome/browser/ui/toolbar/media_router_action.h

index 70e216499cf5ffca47d3067ffc7408a38f4c947c..0f51835826a95a1b0d868bea1cb3dea13d3c5895 100644

--- a/chrome/browser/ui/toolbar/media_router_action.h

+++ b/chrome/browser/ui/toolbar/media_router_action.h

@@ -21,8 +21,8 @@ class MediaRouterAction : public ToolbarActionViewController {

// ToolbarActionViewController implementation.

const std::string& GetId() const override;

void SetDelegate(ToolbarActionViewDelegate* delegate) override;

- gfx::Image GetIcon(content::WebContents* web_contents) override;

- gfx::ImageSkia GetIconWithBadge() override;

+ gfx::Image GetIcon(content::WebContents* web_contents,

+ const gfx::Size& size) override;

base::string16 GetActionName() const override;

base::string16 GetAccessibleName(content::WebContents* web_contents)

const override;