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

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

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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 "base/macros.h" 8 #include "base/macros.h"
9 #include "base/scoped_observer.h" 9 #include "base/scoped_observer.h"
10 #include "chrome/browser/media/router/issues_observer.h" 10 #include "chrome/browser/media/router/issues_observer.h"
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 const gfx::Image media_router_idle_icon_; 103 const gfx::Image media_router_idle_icon_;
104 // Indicates there is a warning message. 104 // Indicates there is a warning message.
105 const gfx::Image media_router_warning_icon_; 105 const gfx::Image media_router_warning_icon_;
106 106
107 // The current icon to show. This is updated based on the current issues and 107 // The current icon to show. This is updated based on the current issues and
108 // routes since |this| is an IssueObserver and MediaRoutesObserver. 108 // routes since |this| is an IssueObserver and MediaRoutesObserver.
109 const gfx::Image* current_icon_; 109 const gfx::Image* current_icon_;
110 110
111 // The current issue shown in the Media Router WebUI. Can be null. It is set 111 // The current issue shown in the Media Router WebUI. Can be null. It is set
112 // in OnIssueUpdated(), which is called by the IssueManager. 112 // in OnIssueUpdated(), which is called by the IssueManager.
113 scoped_ptr<media_router::Issue> issue_; 113 std::unique_ptr<media_router::Issue> issue_;
114 114
115 // Whether a local displayable active route exists. 115 // Whether a local displayable active route exists.
116 bool has_local_display_route_; 116 bool has_local_display_route_;
117 117
118 ToolbarActionViewDelegate* delegate_; 118 ToolbarActionViewDelegate* delegate_;
119 119
120 Browser* const browser_; 120 Browser* const browser_;
121 ToolbarActionsBar* const toolbar_actions_bar_; 121 ToolbarActionsBar* const toolbar_actions_bar_;
122 122
123 // The delegate to handle platform-specific implementations. 123 // The delegate to handle platform-specific implementations.
124 scoped_ptr<MediaRouterActionPlatformDelegate> platform_delegate_; 124 std::unique_ptr<MediaRouterActionPlatformDelegate> platform_delegate_;
125 125
126 MediaRouterContextualMenu contextual_menu_; 126 MediaRouterContextualMenu contextual_menu_;
127 127
128 ScopedObserver<TabStripModel, TabStripModelObserver> 128 ScopedObserver<TabStripModel, TabStripModelObserver>
129 tab_strip_model_observer_; 129 tab_strip_model_observer_;
130 130
131 base::WeakPtrFactory<MediaRouterAction> weak_ptr_factory_; 131 base::WeakPtrFactory<MediaRouterAction> weak_ptr_factory_;
132 132
133 DISALLOW_COPY_AND_ASSIGN(MediaRouterAction); 133 DISALLOW_COPY_AND_ASSIGN(MediaRouterAction);
134 }; 134 };
135 135
136 #endif // CHROME_BROWSER_UI_TOOLBAR_MEDIA_ROUTER_ACTION_H_ 136 #endif // CHROME_BROWSER_UI_TOOLBAR_MEDIA_ROUTER_ACTION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698