chrome/browser/ui/toolbar/media_router_action.h - Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr

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 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/toolbar/component_toolbar_actions_factory.cc ('k') | chrome/browser/ui/toolbar/media_router_action_platform_delegate.h » ('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 bb5a9dbca135d133340aa561fcc2aa45c1cd0b8f..4efff0e54cb3e30a8b0b14916f7488781432e4f4 100644

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

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

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

// The current issue shown in the Media Router WebUI. Can be null. It is set

// in OnIssueUpdated(), which is called by the IssueManager.

- scoped_ptr<media_router::Issue> issue_;

+ std::unique_ptr<media_router::Issue> issue_;

// Whether a local displayable active route exists.

bool has_local_display_route_;

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

ToolbarActionsBar* const toolbar_actions_bar_;

// The delegate to handle platform-specific implementations.

- scoped_ptr<MediaRouterActionPlatformDelegate> platform_delegate_;

+ std::unique_ptr<MediaRouterActionPlatformDelegate> platform_delegate_;

MediaRouterContextualMenu contextual_menu_;