Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1140)

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
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_;

Powered by Google App Engine
This is Rietveld 408576698