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

Unified Diff: trunk/src/ash/wm/gestures/system_pinch_handler.h

Issue 132183006: Revert 244050 "This is part 1 of implemeting phantom windows for..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 11 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 | « trunk/src/ash/ash.gyp ('k') | trunk/src/ash/wm/gestures/system_pinch_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « trunk/src/ash/ash.gyp ('k') | trunk/src/ash/wm/gestures/system_pinch_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698