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

Unified 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..9b28d8e1f5b24cdf18a9d25e78f90b05c883e7d0 100644
--- a/ash/wm/immersive_fullscreen_controller.h
+++ b/ash/wm/immersive_fullscreen_controller.h
@@ -5,6 +5,7 @@
#ifndef ASH_WM_IMMERSIVE_FULLSCREEN_CONTROLLER_H_
#define ASH_WM_IMMERSIVE_FULLSCREEN_CONTROLLER_H_
+#include <memory>
#include <vector>
#include "ash/ash_export.h"
@@ -16,6 +17,7 @@
#include "ui/gfx/animation/animation_delegate.h"
#include "ui/views/focus/focus_manager.h"
#include "ui/views/widget/widget_observer.h"
+
#include "ui/wm/core/transient_window_observer.h"
namespace aura {
@@ -274,22 +276,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_;
« 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