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

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

Issue 1303343003: [ToolbarActionViewController] Update return type of GetId(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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 "chrome/browser/media/router/issues_observer.h" 8 #include "chrome/browser/media/router/issues_observer.h"
9 #include "chrome/browser/media/router/media_routes_observer.h" 9 #include "chrome/browser/media/router/media_routes_observer.h"
10 #include "chrome/browser/ui/toolbar/media_router_contextual_menu.h" 10 #include "chrome/browser/ui/toolbar/media_router_contextual_menu.h"
11 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h" 11 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
12 12
13 class Browser; 13 class Browser;
14 class MediaRouterActionPlatformDelegate; 14 class MediaRouterActionPlatformDelegate;
15 15
16 namespace media_router { 16 namespace media_router {
17 class MediaRouterDialogController; 17 class MediaRouterDialogController;
18 } // namespace media_router 18 } // namespace media_router
19 19
20 // The class for the Media Router component action that will be shown in 20 // The class for the Media Router component action that will be shown in
21 // the toolbar. 21 // the toolbar.
22 class MediaRouterAction : public ToolbarActionViewController, 22 class MediaRouterAction : public ToolbarActionViewController,
23 public media_router::IssuesObserver, 23 public media_router::IssuesObserver,
24 public media_router::MediaRoutesObserver { 24 public media_router::MediaRoutesObserver {
25 public: 25 public:
26 explicit MediaRouterAction(Browser* browser); 26 explicit MediaRouterAction(Browser* browser);
27 ~MediaRouterAction() override; 27 ~MediaRouterAction() override;
28 28
29 // ToolbarActionViewController implementation. 29 // ToolbarActionViewController implementation.
30 const std::string& GetId() const override; 30 std::string GetId() const override;
31 void SetDelegate(ToolbarActionViewDelegate* delegate) override; 31 void SetDelegate(ToolbarActionViewDelegate* delegate) override;
32 gfx::Image GetIcon(content::WebContents* web_contents, 32 gfx::Image GetIcon(content::WebContents* web_contents,
33 const gfx::Size& size) override; 33 const gfx::Size& size) override;
34 base::string16 GetActionName() const override; 34 base::string16 GetActionName() const override;
35 base::string16 GetAccessibleName(content::WebContents* web_contents) 35 base::string16 GetAccessibleName(content::WebContents* web_contents)
36 const override; 36 const override;
37 base::string16 GetTooltip(content::WebContents* web_contents) 37 base::string16 GetTooltip(content::WebContents* web_contents)
38 const override; 38 const override;
39 bool IsEnabled(content::WebContents* web_contents) const override; 39 bool IsEnabled(content::WebContents* web_contents) const override;
40 bool WantsToRun(content::WebContents* web_contents) const override; 40 bool WantsToRun(content::WebContents* web_contents) const override;
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 97
98 // The delegate to handle platform-specific implementations. 98 // The delegate to handle platform-specific implementations.
99 scoped_ptr<MediaRouterActionPlatformDelegate> platform_delegate_; 99 scoped_ptr<MediaRouterActionPlatformDelegate> platform_delegate_;
100 100
101 MediaRouterContextualMenu contextual_menu_; 101 MediaRouterContextualMenu contextual_menu_;
102 102
103 DISALLOW_COPY_AND_ASSIGN(MediaRouterAction); 103 DISALLOW_COPY_AND_ASSIGN(MediaRouterAction);
104 }; 104 };
105 105
106 #endif // CHROME_BROWSER_UI_TOOLBAR_MEDIA_ROUTER_ACTION_H_ 106 #endif // CHROME_BROWSER_UI_TOOLBAR_MEDIA_ROUTER_ACTION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698