chrome/browser/ui/toolbar/media_router_action.cc - 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.cc

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/toolbar/media_router_action.h ('k') | chrome/browser/ui/toolbar/test_toolbar_action_view_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index c35a89b3e1744837f9c9ea5fbea379fac3efd59a..f6742e6dde4bc5417bb68fdeba741992317ec468 100644

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

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

@@ -27,7 +27,6 @@ using media_router::MediaRouterDialogController;

MediaRouterAction::MediaRouterAction(Browser* browser)

: media_router::IssuesObserver(GetMediaRouter(browser)),

media_router::MediaRoutesObserver(GetMediaRouter(browser)),

- id_(ComponentToolbarActionsFactory::kMediaRouterActionId),

media_router_active_icon_(

ui::ResourceBundle::GetSharedInstance()

.GetImageNamed(IDR_MEDIA_ROUTER_ACTIVE_ICON)),

@@ -47,8 +46,8 @@ MediaRouterAction::MediaRouterAction(Browser* browser)

MediaRouterAction::~MediaRouterAction() {

}

-const std::string& MediaRouterAction::GetId() const {

- return id_;

+std::string MediaRouterAction::GetId() const {

+ return ComponentToolbarActionsFactory::kMediaRouterActionId;

}

void MediaRouterAction::SetDelegate(ToolbarActionViewDelegate* delegate) {

« no previous file with comments | « chrome/browser/ui/toolbar/media_router_action.h ('k') | chrome/browser/ui/toolbar/test_toolbar_action_view_controller.h » ('j') | no next file with comments »