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

Side by Side Diff: chrome/browser/ui/toolbar/media_router_action.h

Issue 2579613002: [Media Router Action] Hide action back in the overflow menu after popping it out (Closed)
Patch Set: Address Robert's comment Created 3 years, 11 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_TOOLBAR_MEDIA_ROUTER_ACTION_H_ 5 #ifndef CHROME_BROWSER_UI_TOOLBAR_MEDIA_ROUTER_ACTION_H_
6 #define CHROME_BROWSER_UI_TOOLBAR_MEDIA_ROUTER_ACTION_H_ 6 #define CHROME_BROWSER_UI_TOOLBAR_MEDIA_ROUTER_ACTION_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 10
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 base::string16 GetAccessibleName(content::WebContents* web_contents) 49 base::string16 GetAccessibleName(content::WebContents* web_contents)
50 const override; 50 const override;
51 base::string16 GetTooltip(content::WebContents* web_contents) 51 base::string16 GetTooltip(content::WebContents* web_contents)
52 const override; 52 const override;
53 bool IsEnabled(content::WebContents* web_contents) const override; 53 bool IsEnabled(content::WebContents* web_contents) const override;
54 bool WantsToRun(content::WebContents* web_contents) const override; 54 bool WantsToRun(content::WebContents* web_contents) const override;
55 bool HasPopup(content::WebContents* web_contents) const override; 55 bool HasPopup(content::WebContents* web_contents) const override;
56 void HidePopup() override; 56 void HidePopup() override;
57 gfx::NativeView GetPopupNativeView() override; 57 gfx::NativeView GetPopupNativeView() override;
58 ui::MenuModel* GetContextMenu() override; 58 ui::MenuModel* GetContextMenu() override;
59 void OnContextMenuClosed() override;
59 bool ExecuteAction(bool by_user) override; 60 bool ExecuteAction(bool by_user) override;
60 void UpdateState() override; 61 void UpdateState() override;
61 bool DisabledClickOpensMenu() const override; 62 bool DisabledClickOpensMenu() const override;
62 63
63 // media_router::IssuesObserver: 64 // media_router::IssuesObserver:
64 void OnIssue(const media_router::Issue& issue) override; 65 void OnIssue(const media_router::Issue& issue) override;
65 void OnIssuesCleared() override; 66 void OnIssuesCleared() override;
66 67
67 // media_router::MediaRoutesObserver: 68 // media_router::MediaRoutesObserver:
68 void OnRoutesUpdated(const std::vector<media_router::MediaRoute>& routes, 69 void OnRoutesUpdated(const std::vector<media_router::MediaRoute>& routes,
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 tab_strip_model_observer_; 138 tab_strip_model_observer_;
138 ScopedObserver<ToolbarActionsBar, ToolbarActionsBarObserver> 139 ScopedObserver<ToolbarActionsBar, ToolbarActionsBarObserver>
139 toolbar_actions_bar_observer_; 140 toolbar_actions_bar_observer_;
140 141
141 base::WeakPtrFactory<MediaRouterAction> weak_ptr_factory_; 142 base::WeakPtrFactory<MediaRouterAction> weak_ptr_factory_;
142 143
143 DISALLOW_COPY_AND_ASSIGN(MediaRouterAction); 144 DISALLOW_COPY_AND_ASSIGN(MediaRouterAction);
144 }; 145 };
145 146
146 #endif // CHROME_BROWSER_UI_TOOLBAR_MEDIA_ROUTER_ACTION_H_ 147 #endif // CHROME_BROWSER_UI_TOOLBAR_MEDIA_ROUTER_ACTION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698