Shuffles around immersive related classes

ash/shared/immersive_fullscreen_controller.cc

 // Copyright 2013 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/immersive_fullscreen_controller.h"
+#include "ash/shared/immersive_fullscreen_controller.h"
 
 #include <set>
 
-#include "ash/common/ash_constants.h"
-#include "ash/common/wm/immersive/wm_immersive_fullscreen_controller_delegate.h"
 #include "ash/shared/immersive_context.h"
 #include "ash/shared/immersive_focus_watcher.h"
+#include "ash/shared/immersive_fullscreen_controller_delegate.h"
 #include "ash/shared/immersive_gesture_handler.h"
-#include "ash/wm/immersive_handler_factory.h"
+#include "ash/shared/immersive_handler_factory.h"
 #include "base/metrics/histogram.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/events/base_event_utils.h"
 #include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/views/bubble/bubble_dialog_delegate.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
@@ skipping 23 matching lines @@
 const int kSwipeVerticalThresholdMultiplier = 3;
 
 // The height in pixels of the region above the top edge of the display which
 // hosts the immersive fullscreen window in which mouse events are ignored
 // (cannot reveal or unreveal the top-of-window views).
 // See ShouldIgnoreMouseEventAtLocation() for more details.
 const int kHeightOfDeadRegionAboveTopContainer = 10;
 
 }  // namespace
 
-// The height in pixels of the region below the top edge of the display in which
-// the mouse can trigger revealing the top-of-window views.
-// The height must be greater than 1px because the top pixel is used to trigger
-// moving the cursor between displays if the user has a vertical display layout
-// (primary display above/below secondary display).
+// static
+const int ImmersiveFullscreenController::kImmersiveFullscreenTopEdgeInset = 8;
+
+// static
 const int ImmersiveFullscreenController::kMouseRevealBoundsHeight = 3;
 
 ////////////////////////////////////////////////////////////////////////////////
 
 ImmersiveFullscreenController::ImmersiveFullscreenController()
     : delegate_(NULL),
       top_container_(NULL),
       widget_(NULL),
       observers_enabled_(false),
       enabled_(false),
       reveal_state_(CLOSED),
       revealed_lock_count_(0),
       mouse_x_when_hit_top_in_screen_(-1),
       gesture_begun_(false),
       animation_(new gfx::SlideAnimation(this)),
       animations_disabled_for_test_(false),
       weak_ptr_factory_(this) {}
 
 ImmersiveFullscreenController::~ImmersiveFullscreenController() {
   EnableWindowObservers(false);
 }
 
 void ImmersiveFullscreenController::Init(
-    WmImmersiveFullscreenControllerDelegate* delegate,
+    ImmersiveFullscreenControllerDelegate* delegate,
     views::Widget* widget,
     views::View* top_container) {
   delegate_ = delegate;
   top_container_ = top_container;
   widget_ = widget;
   ImmersiveContext::Get()->InstallResizeHandleWindowTargeter(this);
 }
 
 void ImmersiveFullscreenController::SetEnabled(WindowType window_type,
                                                bool enabled) {
@@ skipping 549 matching lines @@
           location.y() < hit_bounds_in_screen.y() &&
           location.x() >= hit_bounds_in_screen.x() &&
           location.x() < hit_bounds_in_screen.right());
 }
 
 gfx::Rect ImmersiveFullscreenController::GetDisplayBoundsInScreen() const {
   return ImmersiveContext::Get()->GetDisplayBoundsInScreen(widget_);
 }
 
 }  // namespace ash