Index: ash/wm/immersive_fullscreen_controller.h |
diff --git a/ash/wm/immersive_fullscreen_controller.h b/ash/wm/immersive_fullscreen_controller.h |
index a9d761490b2cbbacb1da308e5753c6924dbafca9..2183de849f0f0a72608ff6eb67ec42621bbf035a 100644 |
--- a/ash/wm/immersive_fullscreen_controller.h |
+++ b/ash/wm/immersive_fullscreen_controller.h |
@@ -274,22 +274,22 @@ class ASH_EXPORT ImmersiveFullscreenController |
// mouse state and the current touch state. Acquiring the lock is used to |
// trigger a reveal when the user moves the mouse to the top of the screen |
// and when the user does a SWIPE_OPEN edge gesture. |
- scoped_ptr<ImmersiveRevealedLock> located_event_revealed_lock_; |
+ std::unique_ptr<ImmersiveRevealedLock> located_event_revealed_lock_; |
// Lock which keeps the top-of-window views revealed based on the focused view |
// and the active widget. Acquiring the lock never triggers a reveal because |
// a view is not focusable till a reveal has made it visible. |
- scoped_ptr<ImmersiveRevealedLock> focus_revealed_lock_; |
+ std::unique_ptr<ImmersiveRevealedLock> focus_revealed_lock_; |
// The animation which controls sliding the top-of-window views in and out. |
- scoped_ptr<gfx::SlideAnimation> animation_; |
+ std::unique_ptr<gfx::SlideAnimation> animation_; |
// Whether the animations are disabled for testing. |
bool animations_disabled_for_test_; |
// Manages bubbles which are anchored to a child of |top_container_|. |
class BubbleObserver; |
- scoped_ptr<BubbleObserver> bubble_observer_; |
+ std::unique_ptr<BubbleObserver> bubble_observer_; |
base::WeakPtrFactory<ImmersiveFullscreenController> weak_ptr_factory_; |