Revert 244050 "This is part 1 of implemeting phantom windows for..."

trunk/src/ash/wm/gestures/system_pinch_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/gestures/system_pinch_handler.h"
 
 #include "ash/screen_ash.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
@@ skipping 12 matching lines @@
 const double kPinchThresholdForMaximize = 1.5;
 const double kPinchThresholdForMinimize = 0.7;
 
 namespace ash {
 namespace internal {
 
 const int SystemPinchHandler::kSystemGesturePoints = 4;
 
 SystemPinchHandler::SystemPinchHandler(aura::Window* target)
     : target_(target),
+      phantom_(target),
       phantom_state_(PHANTOM_WINDOW_NORMAL),
       pinch_factor_(1.) {
   widget_ = views::Widget::GetWidgetForNativeWindow(target_);
 }
 
 SystemPinchHandler::~SystemPinchHandler() {
 }
 
 SystemGestureStatus SystemPinchHandler::ProcessGestureEvent(
     const ui::GestureEvent& event) {
@@ skipping 21 matching lines @@
         }
       }
       return SYSTEM_GESTURE_END;
     }
 
     case ui::ET_GESTURE_PINCH_UPDATE: {
       // The PINCH_UPDATE events contain incremental scaling updates.
       pinch_factor_ *= event.details().scale();
       gfx::Rect bounds =
           GetPhantomWindowScreenBounds(target_, event.location());
-      if (phantom_state_ != PHANTOM_WINDOW_NORMAL || phantom_.get()) {
-        if (!phantom_.get())
-          phantom_.reset(new internal::PhantomWindowController(target_));
-        phantom_->Show(bounds);
-     }
+      if (phantom_state_ != PHANTOM_WINDOW_NORMAL || phantom_.IsShowing())
+        phantom_.Show(bounds);
       break;
     }
 
     case ui::ET_GESTURE_MULTIFINGER_SWIPE: {
-      phantom_.reset();
+      phantom_.Hide();
       pinch_factor_ = 1.0;
       phantom_state_ = PHANTOM_WINDOW_NORMAL;
 
       if (event.details().swipe_left() || event.details().swipe_right()) {
         // Snap for left/right swipes.
         ui::ScopedLayerAnimationSettings settings(
             target_->layer()->GetAnimator());
         internal::SnapSizer::SnapWindow(window_state,
             event.details().swipe_left() ? internal::SnapSizer::LEFT_EDGE :
                                            internal::SnapSizer::RIGHT_EDGE);
@@ skipping 41 matching lines @@
     phantom_state_ = PHANTOM_WINDOW_MINIMIZED;
     return rect;
   }
 
   phantom_state_ = PHANTOM_WINDOW_NORMAL;
   return window->bounds();
 }
 
 }  // namespace internal
 }  // namespace ash