diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-10 02:33:55 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-10 02:33:55 +0000 |
| commit | 70206ac07909db07292b0212bc895e8784795895 (patch) | |
| tree | 80873c7787528c471f3835ce61ffb6d3d2e0e8df /ash/wm/gestures/system_pinch_handler.h | |
| parent | 465d36fe122a9cfc2739d721e7c2bba0149b944f (diff) | |
| download | chromium_src-70206ac07909db07292b0212bc895e8784795895.zip chromium_src-70206ac07909db07292b0212bc895e8784795895.tar.gz chromium_src-70206ac07909db07292b0212bc895e8784795895.tar.bz2 | |
This is part 1 of implemeting phantom windows for the window controls when using --ash-enable-alternate-caption-button
Other notable changes:
- Switched to using layer animations instead of gfx::SlideAnimation
- Renamed PhantomWindowController::phantom_widget_ and PhantomWindowController::phantom_widget_start_ to PhantomWindowController::phantom_widget_in_target_root_ and PhantomWindowController::phantom_widget_in_start_root_ respectively.
- Removed PhantomWindowController::Hide(). Hiding the phantom window can now only be done via destroying the PhantomWindowController
BUG=328930
TEST=PhantomWindowControllerTest.*
Review URL: https://codereview.chromium.org/101773004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244050 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/gestures/system_pinch_handler.h')
| -rw-r--r-- | ash/wm/gestures/system_pinch_handler.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/wm/gestures/system_pinch_handler.h b/ash/wm/gestures/system_pinch_handler.h index d5c5a0e..1225c90 100644 --- a/ash/wm/gestures/system_pinch_handler.h +++ b/ash/wm/gestures/system_pinch_handler.h @@ -6,6 +6,7 @@ #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; @@ -64,7 +65,7 @@ class SystemPinchHandler { // A phantom window is used to provide visual cues for // pinch-to-resize/maximize/minimize gestures. - PhantomWindowController phantom_; + scoped_ptr<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 |