wm: public window_types.

ash/wm/gestures/two_finger_drag_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/two_finger_drag_handler.h"
 
 #include "ash/wm/window_resizer.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace/snap_sizer.h"
-#include "ui/aura/client/window_types.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/base/hit_test.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
+#include "ui/wm/public/window_types.h"
 
 namespace {
 
 bool IsTopEdge(int component) {
   return component == HTTOPLEFT ||
          component == HTTOP ||
          component == HTTOPRIGHT;
 }
 
 bool IsBottomEdge(int component) {
@@ skipping 62 matching lines @@
     first_finger_hittest_ =
         target->delegate()->GetNonClientComponent(event.location());
     return false;
   }
 
   wm::WindowState* window_state = wm::GetWindowState(target);
 
   if (event.type() == ui::ET_GESTURE_BEGIN &&
       event.details().touch_points() == 2) {
     if (!in_gesture_drag_ && window_state->IsNormalShowState() &&
-      target->type() == aura::client::WINDOW_TYPE_NORMAL) {
+        target->type() == ui::wm::WINDOW_TYPE_NORMAL) {
       if (WindowComponentsAllowMoving(first_finger_hittest_,
           target->delegate()->GetNonClientComponent(event.location()))) {
         in_gesture_drag_ = true;
         target->AddObserver(this);
         // Only create a new WindowResizer if one doesn't already exist
         // for the target window.
         window_resizer_ = CreateWindowResizer(
             target,
             event.details().bounding_box().CenterPoint(),
             HTCAPTION,
             aura::client::WINDOW_MOVE_SOURCE_TOUCH);
         return true;
       }
     }
 
     return false;
   }
 
   if (!in_gesture_drag_) {
     // Consume all two-finger gestures on a normal window.
     return event.details().touch_points() == 2 &&
-           target->type() == aura::client::WINDOW_TYPE_NORMAL &&
+           target->type() == ui::wm::WINDOW_TYPE_NORMAL &&
            window_state->IsNormalShowState();
   }
   // Since |in_gesture_drag_| is true a resizer was either created above or
   // it was created elsewhere and can be found in |window_state|.
   WindowResizer* any_window_resizer = window_resizer_ ?
       window_resizer_.get() : window_state->window_resizer();
   DCHECK(any_window_resizer);
 
   if (target != any_window_resizer->GetTarget())
     return false;
@@ skipping 73 matching lines @@
                                                      bool visible) {
   Reset(window);
 }
 
 void TwoFingerDragHandler::OnWindowDestroying(aura::Window* window) {
   Reset(window);
 }
 
 }  // namespace internal
 }  // namespace ash