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

Side by Side Diff: ash/system/tray/tray_background_view.h

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments 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
« no previous file with comments | « ash/system/tray/system_tray_unittest.cc ('k') | ash/system/tray/tray_bar_button_with_title.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_ 5 #ifndef ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_
6 #define ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_ 6 #define ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_
7 7
8 #include <memory>
9
8 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
9 #include "ash/shelf/background_animator.h" 11 #include "ash/shelf/background_animator.h"
10 #include "ash/shelf/shelf_types.h" 12 #include "ash/shelf/shelf_types.h"
11 #include "ash/system/tray/actionable_view.h" 13 #include "ash/system/tray/actionable_view.h"
12 #include "base/macros.h" 14 #include "base/macros.h"
13 #include "ui/compositor/layer_animation_observer.h" 15 #include "ui/compositor/layer_animation_observer.h"
14 #include "ui/views/bubble/tray_bubble_view.h" 16 #include "ui/views/bubble/tray_bubble_view.h"
15 17
16 namespace ash { 18 namespace ash {
17 class ShelfLayoutManager; 19 class ShelfLayoutManager;
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 BackgroundAnimator hide_background_animator_; 183 BackgroundAnimator hide_background_animator_;
182 BackgroundAnimator hover_background_animator_; 184 BackgroundAnimator hover_background_animator_;
183 185
184 // True if the background gets hovered. 186 // True if the background gets hovered.
185 bool hovered_; 187 bool hovered_;
186 188
187 // This variable stores the activation override which will tint the background 189 // This variable stores the activation override which will tint the background
188 // differently if set to true. 190 // differently if set to true.
189 bool draw_background_as_active_; 191 bool draw_background_as_active_;
190 192
191 scoped_ptr<TrayWidgetObserver> widget_observer_; 193 std::unique_ptr<TrayWidgetObserver> widget_observer_;
192 scoped_ptr<TrayEventFilter> tray_event_filter_; 194 std::unique_ptr<TrayEventFilter> tray_event_filter_;
193 195
194 DISALLOW_COPY_AND_ASSIGN(TrayBackgroundView); 196 DISALLOW_COPY_AND_ASSIGN(TrayBackgroundView);
195 }; 197 };
196 198
197 } // namespace ash 199 } // namespace ash
198 200
199 #endif // ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_ 201 #endif // ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_
OLDNEW
« no previous file with comments | « ash/system/tray/system_tray_unittest.cc ('k') | ash/system/tray/tray_bar_button_with_title.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698