Chromium Code Reviews| Index: chrome/browser/ui/toolbar/media_router_contextual_menu.h |
| diff --git a/chrome/browser/ui/toolbar/media_router_contextual_menu.h b/chrome/browser/ui/toolbar/media_router_contextual_menu.h |
| index 234f7852597e4be46c1ef75b09ec94a17e130c61..2b41ccc2426432580683933e28acffd84c416f9c 100644 |
| --- a/chrome/browser/ui/toolbar/media_router_contextual_menu.h |
| +++ b/chrome/browser/ui/toolbar/media_router_contextual_menu.h |
| @@ -6,10 +6,12 @@ |
| #define CHROME_BROWSER_UI_TOOLBAR_MEDIA_ROUTER_CONTEXTUAL_MENU_H_ |
| #include "base/macros.h" |
| +#include "base/memory/weak_ptr.h" |
| #include "base/strings/utf_string_conversions.h" |
| #include "ui/base/models/simple_menu_model.h" |
| class Browser; |
| +class MediaRouterAction; |
| // The class for the contextual menu for the Media Router action. |
| class MediaRouterContextualMenu : public ui::SimpleMenuModel::Delegate { |
| @@ -18,6 +20,7 @@ class MediaRouterContextualMenu : public ui::SimpleMenuModel::Delegate { |
| ~MediaRouterContextualMenu() override; |
| ui::MenuModel* menu_model() { return &menu_model_; } |
| + void SetMediaRouterAction(const base::WeakPtr<MediaRouterAction>& action); |
| private: |
| // ui::SimpleMenuModel::Delegate: |
| @@ -27,10 +30,10 @@ class MediaRouterContextualMenu : public ui::SimpleMenuModel::Delegate { |
| void ExecuteCommand(int command_id, int event_flags) override; |
| void ReportIssue(); |
| - void RemoveMediaRouterComponentAction(); |
| Browser* browser_; |
| ui::SimpleMenuModel menu_model_; |
| + base::WeakPtr<MediaRouterAction> action_; |
|
Devlin
2016/07/26 21:59:02
MediaRouterAction owns this object, right? Why do
takumif
2016/07/28 20:04:11
Changing to a normal pointer.
|
| DISALLOW_COPY_AND_ASSIGN(MediaRouterContextualMenu); |
| }; |