chrome/browser/ui/toolbar/media_router_action.h - Issue 1495653003: [Media Router] Check MediaRouterDialogControllerImpl only sets toolbar MediaRouterAction.

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 1495653003: [Media Router] Check MediaRouterDialogControllerImpl only sets toolbar MediaRouterAction. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Changes per pkasting@'s comments. Created 5 years 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.cc » ('j') | chrome/browser/ui/toolbar/media_router_action.cc » ('J')
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 f7797c0ba7a3ae55cd258a93df4513aac1c84579..e6bff75d077f145a9cc9cdd48361cd004e2b1581 100644

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

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

@@ -11,6 +11,7 @@

#include "chrome/browser/ui/tabs/tab_strip_model_observer.h"

#include "chrome/browser/ui/toolbar/media_router_contextual_menu.h"

#include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"

+#include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"

class Browser;

class MediaRouterActionPlatformDelegate;

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

public media_router::LocalMediaRoutesObserver,

public TabStripModelObserver {

public:

- explicit MediaRouterAction(Browser* browser);

+ MediaRouterAction(Browser* browser, ToolbarActionsBar* toolbar_actions_bar);

~MediaRouterAction() override;

// ToolbarActionViewController implementation.

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

ToolbarActionViewDelegate* delegate_;

Browser* const browser_;

+ ToolbarActionsBar* const toolbar_actions_bar_;

// The delegate to handle platform-specific implementations.

scoped_ptr<MediaRouterActionPlatformDelegate> platform_delegate_;