Shuffles around immersive related classes

ash/wm/resize_handle_window_targeter.cc

 // Copyright 2014 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/resize_handle_window_targeter.h"
 
 #include "ash/common/ash_constants.h"
 #include "ash/common/wm/window_state.h"
-#include "ash/wm/immersive_fullscreen_controller.h"
+#include "ash/shared/immersive_fullscreen_controller.h"
 #include "ash/wm/window_state_aura.h"
 #include "ui/aura/window.h"
 #include "ui/events/event.h"
 
 namespace ash {
 
 ResizeHandleWindowTargeter::ResizeHandleWindowTargeter(
     aura::Window* window,
-    WmImmersiveFullscreenController* controller)
+    ImmersiveFullscreenController* controller)
     : window_(window), immersive_controller_(controller) {
   wm::WindowState* window_state = wm::GetWindowState(window_);
   OnPostWindowStateTypeChange(window_state, wm::WINDOW_STATE_TYPE_DEFAULT);
   window_state->AddObserver(this);
   window_->AddObserver(this);
 }
 
 ResizeHandleWindowTargeter::~ResizeHandleWindowTargeter() {
   if (window_) {
     window_->RemoveObserver(this);
@@ skipping 25 matching lines @@
   if (window == window_) {
     gfx::Insets insets;
     if (immersive_controller_ && immersive_controller_->IsEnabled() &&
         !immersive_controller_->IsRevealed() && event->IsTouchEvent()) {
       // If the window is in immersive fullscreen, and top-of-window views are
       // not revealed, then touch events towards the top of the window
       // should not reach the child window so that touch gestures can be used to
       // reveal the top-of-windows views. This is needed because the child
       // window may consume touch events and prevent touch-scroll gesture from
       // being generated.
-      insets = gfx::Insets(kImmersiveFullscreenTopEdgeInset, 0, 0, 0);
+      insets = gfx::Insets(
+          ImmersiveFullscreenController::kImmersiveFullscreenTopEdgeInset, 0, 0,
+          0);
     } else {
       // If the event falls very close to the inside of the frame border, then
       // target the window itself, so that the window can be resized easily.
       insets = frame_border_inset_;
     }
 
     if (!insets.IsEmpty()) {
       gfx::Rect bounds = gfx::Rect(window_->bounds().size());
       bounds.Inset(insets);
       if (!bounds.Contains(event->location()))
@@ skipping 15 matching lines @@
       aura::WindowTargeter* targeter =
           static_cast<aura::WindowTargeter*>(parent->GetEventTargeter());
       if (targeter)
         return targeter->SubtreeShouldBeExploredForEvent(window, event);
     }
   }
   return aura::WindowTargeter::SubtreeShouldBeExploredForEvent(window, event);
 }
 
 }  // namespace ash