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

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: 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 (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
oshima 2016/04/08 07:09:41 include?
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/shelf/background_animator.h" 9 #include "ash/shelf/background_animator.h"
10 #include "ash/shelf/shelf_types.h" 10 #include "ash/shelf/shelf_types.h"
11 #include "ash/system/tray/actionable_view.h" 11 #include "ash/system/tray/actionable_view.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "ui/compositor/layer_animation_observer.h" 13 #include "ui/compositor/layer_animation_observer.h"
14 #include "ui/views/bubble/tray_bubble_view.h" 14 #include "ui/views/bubble/tray_bubble_view.h"
15 15
16 namespace ash { 16 namespace ash {
17 class ShelfLayoutManager; 17 class ShelfLayoutManager;
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 BackgroundAnimator hide_background_animator_; 181 BackgroundAnimator hide_background_animator_;
182 BackgroundAnimator hover_background_animator_; 182 BackgroundAnimator hover_background_animator_;
183 183
184 // True if the background gets hovered. 184 // True if the background gets hovered.
185 bool hovered_; 185 bool hovered_;
186 186
187 // This variable stores the activation override which will tint the background 187 // This variable stores the activation override which will tint the background
188 // differently if set to true. 188 // differently if set to true.
189 bool draw_background_as_active_; 189 bool draw_background_as_active_;
190 190
191 scoped_ptr<TrayWidgetObserver> widget_observer_; 191 std::unique_ptr<TrayWidgetObserver> widget_observer_;
192 scoped_ptr<TrayEventFilter> tray_event_filter_; 192 std::unique_ptr<TrayEventFilter> tray_event_filter_;
193 193
194 DISALLOW_COPY_AND_ASSIGN(TrayBackgroundView); 194 DISALLOW_COPY_AND_ASSIGN(TrayBackgroundView);
195 }; 195 };
196 196
197 } // namespace ash 197 } // namespace ash
198 198
199 #endif // ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_ 199 #endif // ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698