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

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

Issue 1149893020: [Media Router] Implement MediaRouterAction + MediaRouterUI tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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/ui/toolbar/toolbar_action_view_controller.h" 8 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
9 9
10 // The class for the Media Router component action that will be shown in 10 // The class for the Media Router component action that will be shown in
(...skipping 17 matching lines...) Expand all
28 bool WantsToRun(content::WebContents* web_contents) const override; 28 bool WantsToRun(content::WebContents* web_contents) const override;
29 bool HasPopup(content::WebContents* web_contents) const override; 29 bool HasPopup(content::WebContents* web_contents) const override;
30 void HidePopup() override; 30 void HidePopup() override;
31 gfx::NativeView GetPopupNativeView() override; 31 gfx::NativeView GetPopupNativeView() override;
32 ui::MenuModel* GetContextMenu() override; 32 ui::MenuModel* GetContextMenu() override;
33 bool CanDrag() const override; 33 bool CanDrag() const override;
34 bool ExecuteAction(bool by_user) override; 34 bool ExecuteAction(bool by_user) override;
35 void UpdateState() override; 35 void UpdateState() override;
36 36
37 private: 37 private:
38 content::WebContents* GetMediaRouterDialog() const;
Peter Kasting 2015/06/04 00:17:52 Const functions may not return non-const pointers.
imcheng (use chromium acct) 2015/06/04 01:04:20 Removed this function since it is not used.
39
38 const std::string id_; 40 const std::string id_;
39 const base::string16 name_; 41 const base::string16 name_;
40 42
41 // Cached icons. 43 // Cached icons.
42 gfx::Image media_router_idle_icon_; 44 gfx::Image media_router_idle_icon_;
43 45
44 ToolbarActionViewDelegate* delegate_; 46 ToolbarActionViewDelegate* delegate_;
45 47
46 DISALLOW_COPY_AND_ASSIGN(MediaRouterAction); 48 DISALLOW_COPY_AND_ASSIGN(MediaRouterAction);
47 }; 49 };
48 50
49 #endif // CHROME_BROWSER_UI_TOOLBAR_MEDIA_ROUTER_ACTION_H_ 51 #endif // CHROME_BROWSER_UI_TOOLBAR_MEDIA_ROUTER_ACTION_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/toolbar/media_router_action.cc » ('j') | chrome/browser/ui/toolbar/media_router_action.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698