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

Side by Side Diff: ash/wm/immersive_fullscreen_controller.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/wm/gestures/shelf_gesture_handler.h ('k') | ash/wm/immersive_fullscreen_controller.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_WM_IMMERSIVE_FULLSCREEN_CONTROLLER_H_ 5 #ifndef ASH_WM_IMMERSIVE_FULLSCREEN_CONTROLLER_H_
6 #define ASH_WM_IMMERSIVE_FULLSCREEN_CONTROLLER_H_ 6 #define ASH_WM_IMMERSIVE_FULLSCREEN_CONTROLLER_H_
7 7
8 #include <memory>
8 #include <vector> 9 #include <vector>
9 10
10 #include "ash/ash_export.h" 11 #include "ash/ash_export.h"
11 #include "ash/wm/immersive_revealed_lock.h" 12 #include "ash/wm/immersive_revealed_lock.h"
12 #include "base/macros.h" 13 #include "base/macros.h"
13 #include "base/timer/timer.h" 14 #include "base/timer/timer.h"
14 #include "ui/aura/window_observer.h" 15 #include "ui/aura/window_observer.h"
15 #include "ui/events/event_handler.h" 16 #include "ui/events/event_handler.h"
16 #include "ui/gfx/animation/animation_delegate.h" 17 #include "ui/gfx/animation/animation_delegate.h"
17 #include "ui/views/focus/focus_manager.h" 18 #include "ui/views/focus/focus_manager.h"
18 #include "ui/views/widget/widget_observer.h" 19 #include "ui/views/widget/widget_observer.h"
20
19 #include "ui/wm/core/transient_window_observer.h" 21 #include "ui/wm/core/transient_window_observer.h"
20 22
21 namespace aura { 23 namespace aura {
22 class Window; 24 class Window;
23 } 25 }
24 26
25 namespace gfx { 27 namespace gfx {
26 class Point; 28 class Point;
27 class Rect; 29 class Rect;
28 class SlideAnimation; 30 class SlideAnimation;
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 int mouse_x_when_hit_top_in_screen_; 269 int mouse_x_when_hit_top_in_screen_;
268 270
269 // Tracks if the controller has seen a ET_GESTURE_SCROLL_BEGIN, without the 271 // Tracks if the controller has seen a ET_GESTURE_SCROLL_BEGIN, without the
270 // following events. 272 // following events.
271 bool gesture_begun_; 273 bool gesture_begun_;
272 274
273 // Lock which keeps the top-of-window views revealed based on the current 275 // Lock which keeps the top-of-window views revealed based on the current
274 // mouse state and the current touch state. Acquiring the lock is used to 276 // mouse state and the current touch state. Acquiring the lock is used to
275 // trigger a reveal when the user moves the mouse to the top of the screen 277 // trigger a reveal when the user moves the mouse to the top of the screen
276 // and when the user does a SWIPE_OPEN edge gesture. 278 // and when the user does a SWIPE_OPEN edge gesture.
277 scoped_ptr<ImmersiveRevealedLock> located_event_revealed_lock_; 279 std::unique_ptr<ImmersiveRevealedLock> located_event_revealed_lock_;
278 280
279 // Lock which keeps the top-of-window views revealed based on the focused view 281 // Lock which keeps the top-of-window views revealed based on the focused view
280 // and the active widget. Acquiring the lock never triggers a reveal because 282 // and the active widget. Acquiring the lock never triggers a reveal because
281 // a view is not focusable till a reveal has made it visible. 283 // a view is not focusable till a reveal has made it visible.
282 scoped_ptr<ImmersiveRevealedLock> focus_revealed_lock_; 284 std::unique_ptr<ImmersiveRevealedLock> focus_revealed_lock_;
283 285
284 // The animation which controls sliding the top-of-window views in and out. 286 // The animation which controls sliding the top-of-window views in and out.
285 scoped_ptr<gfx::SlideAnimation> animation_; 287 std::unique_ptr<gfx::SlideAnimation> animation_;
286 288
287 // Whether the animations are disabled for testing. 289 // Whether the animations are disabled for testing.
288 bool animations_disabled_for_test_; 290 bool animations_disabled_for_test_;
289 291
290 // Manages bubbles which are anchored to a child of |top_container_|. 292 // Manages bubbles which are anchored to a child of |top_container_|.
291 class BubbleObserver; 293 class BubbleObserver;
292 scoped_ptr<BubbleObserver> bubble_observer_; 294 std::unique_ptr<BubbleObserver> bubble_observer_;
293 295
294 base::WeakPtrFactory<ImmersiveFullscreenController> weak_ptr_factory_; 296 base::WeakPtrFactory<ImmersiveFullscreenController> weak_ptr_factory_;
295 297
296 DISALLOW_COPY_AND_ASSIGN(ImmersiveFullscreenController); 298 DISALLOW_COPY_AND_ASSIGN(ImmersiveFullscreenController);
297 }; 299 };
298 300
299 } // namespace ash 301 } // namespace ash
300 302
301 #endif // ASH_WM_IMMERSIVE_FULLSCREEN_CONTROLLER_H_ 303 #endif // ASH_WM_IMMERSIVE_FULLSCREEN_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ash/wm/gestures/shelf_gesture_handler.h ('k') | ash/wm/immersive_fullscreen_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698