Chromium Code Reviews| Index: ash/shared/immersive_fullscreen_controller.cc |
| diff --git a/ash/wm/immersive_fullscreen_controller.cc b/ash/shared/immersive_fullscreen_controller.cc |
| similarity index 98% |
| rename from ash/wm/immersive_fullscreen_controller.cc |
| rename to ash/shared/immersive_fullscreen_controller.cc |
| index 231f19969af84d8a087b52d3d78f4dfd89b81085..744348781d8953acb22131a3e1e84acdfc24eadc 100644 |
| --- a/ash/wm/immersive_fullscreen_controller.cc |
| +++ b/ash/shared/immersive_fullscreen_controller.cc |
| @@ -2,16 +2,15 @@ |
| // 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" |
| @@ -60,8 +59,12 @@ const int kHeightOfDeadRegionAboveTopContainer = 10; |
| // 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::kMouseRevealBoundsHeight = 3; |
| +// static |
|
James Cook
2016/08/19 18:15:16
nit: Either put the comment here for consistency w
sky
2016/08/19 19:25:40
I moved the above comment to the header as that is
|
| +const int ImmersiveFullscreenController::kImmersiveFullscreenTopEdgeInset = 8; |
| + |
| //////////////////////////////////////////////////////////////////////////////// |
| ImmersiveFullscreenController::ImmersiveFullscreenController() |
| @@ -83,7 +86,7 @@ ImmersiveFullscreenController::~ImmersiveFullscreenController() { |
| } |
| void ImmersiveFullscreenController::Init( |
| - WmImmersiveFullscreenControllerDelegate* delegate, |
| + ImmersiveFullscreenControllerDelegate* delegate, |
| views::Widget* widget, |
| views::View* top_container) { |
| delegate_ = delegate; |