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

Unified Diff: chrome/browser/ui/toolbar/media_router_action.h

Issue 1228223002: Close wrench menu when Media Router Action clicked in Views. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix browser test. Created 5 years, 5 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
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 9540d2c3a024b3003c2d3d3668acd4e803744ceb..3704bf3192f41aae4c92899ab50bd8dd5d10a937 100644
--- a/chrome/browser/ui/toolbar/media_router_action.h
+++ b/chrome/browser/ui/toolbar/media_router_action.h
@@ -5,8 +5,11 @@
#ifndef CHROME_BROWSER_UI_TOOLBAR_MEDIA_ROUTER_ACTION_H_
#define CHROME_BROWSER_UI_TOOLBAR_MEDIA_ROUTER_ACTION_H_
+#include "chrome/browser/ui/toolbar/media_router_action_platform_delegate.h"
Devlin 2015/07/16 17:17:37 Forward declaration. :)
apacible 2015/07/16 18:13:13 Done.
#include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
+class Browser;
+
namespace media_router {
class MediaRouterDialogController;
} // namespace media_router
@@ -15,7 +18,7 @@ class MediaRouterDialogController;
// the toolbar.
class MediaRouterAction : public ToolbarActionViewController {
public:
- MediaRouterAction();
+ explicit MediaRouterAction(Browser* browser);
~MediaRouterAction() override;
// ToolbarActionViewController implementation.
@@ -53,6 +56,9 @@ class MediaRouterAction : public ToolbarActionViewController {
ToolbarActionViewDelegate* delegate_;
+ // The delegate to handle platform-specific implementations.
+ scoped_ptr<MediaRouterActionPlatformDelegate> platform_delegate_;
+
DISALLOW_COPY_AND_ASSIGN(MediaRouterAction);
};

Powered by Google App Engine
This is Rietveld 408576698