chrome/browser/ui/toolbar/media_router_action.h - Issue 1303343003: [ToolbarActionViewController] Update return type of GetId().

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 1303343003: [ToolbarActionViewController] Update return type of GetId(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Changes per pkasting@'s comments. Created 5 years, 4 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/extensions/extension_action_view_controller.cc ('k') | chrome/browser/ui/toolbar/media_router_action.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 7bab99bfdac90d1f773495926b40f9b629e0bfcf..1348386ca34e8d93e071c980baa9ba45ebb6bb1f 100644

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

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

@@ -27,7 +27,7 @@ class MediaRouterAction : public ToolbarActionViewController,

~MediaRouterAction() override;

// ToolbarActionViewController implementation.

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

+ std::string GetId() const override;

void SetDelegate(ToolbarActionViewDelegate* delegate) override;

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

const gfx::Size& size) override;

@@ -69,8 +69,6 @@ class MediaRouterAction : public ToolbarActionViewController,

const gfx::Image* GetCurrentIcon() const;

- const std::string id_;

// Cached icons.

// Indicates that the current Chrome profile is using at least one device.

const gfx::Image media_router_active_icon_;