Index: trunk/src/ash/wm/gestures/system_pinch_handler.h |
=================================================================== |
--- trunk/src/ash/wm/gestures/system_pinch_handler.h (revision 244088) |
+++ trunk/src/ash/wm/gestures/system_pinch_handler.h (working copy) |
@@ -6,7 +6,6 @@ |
#define ASH_WM_GESTURES_SYSTEM_PINCH_HANDLER_H_ |
#include "ash/wm/workspace/phantom_window_controller.h" |
-#include "base/memory/scoped_ptr.h" |
namespace aura { |
class Window; |
@@ -65,7 +64,7 @@ |
// A phantom window is used to provide visual cues for |
// pinch-to-resize/maximize/minimize gestures. |
- scoped_ptr<PhantomWindowController> phantom_; |
+ PhantomWindowController phantom_; |
// When the phantom window is in minimized or maximized state, moving the |
// target window should not move the phantom window. So |phantom_state_| is |