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

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

Issue 2721953002: [Media Router] Add "Hide in menu/Show in toolbar" option to Cast toolbar icon (Closed)
Patch Set: Address Jennifer's and Mike's comments Created 3 years, 9 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
« no previous file with comments | « chrome/app/chrome_command_ids.h ('k') | chrome/browser/ui/toolbar/media_router_action.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 bool has_dialog_; 128 bool has_dialog_;
129 129
130 ToolbarActionViewDelegate* delegate_; 130 ToolbarActionViewDelegate* delegate_;
131 131
132 Browser* const browser_; 132 Browser* const browser_;
133 ToolbarActionsBar* const toolbar_actions_bar_; 133 ToolbarActionsBar* const toolbar_actions_bar_;
134 134
135 // The delegate to handle platform-specific implementations. 135 // The delegate to handle platform-specific implementations.
136 std::unique_ptr<MediaRouterActionPlatformDelegate> platform_delegate_; 136 std::unique_ptr<MediaRouterActionPlatformDelegate> platform_delegate_;
137 137
138 MediaRouterContextualMenu contextual_menu_; 138 std::unique_ptr<MediaRouterContextualMenu> contextual_menu_;
139 139
140 ScopedObserver<TabStripModel, TabStripModelObserver> 140 ScopedObserver<TabStripModel, TabStripModelObserver>
141 tab_strip_model_observer_; 141 tab_strip_model_observer_;
142 ScopedObserver<ToolbarActionsBar, ToolbarActionsBarObserver> 142 ScopedObserver<ToolbarActionsBar, ToolbarActionsBarObserver>
143 toolbar_actions_bar_observer_; 143 toolbar_actions_bar_observer_;
144 144
145 base::WeakPtrFactory<MediaRouterAction> weak_ptr_factory_; 145 base::WeakPtrFactory<MediaRouterAction> weak_ptr_factory_;
146 146
147 DISALLOW_COPY_AND_ASSIGN(MediaRouterAction); 147 DISALLOW_COPY_AND_ASSIGN(MediaRouterAction);
148 }; 148 };
149 149
150 #endif // CHROME_BROWSER_UI_TOOLBAR_MEDIA_ROUTER_ACTION_H_ 150 #endif // CHROME_BROWSER_UI_TOOLBAR_MEDIA_ROUTER_ACTION_H_
OLDNEW
« no previous file with comments | « chrome/app/chrome_command_ids.h ('k') | chrome/browser/ui/toolbar/media_router_action.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698