Shuffles around immersive related classes

ash/common/frame/header_view.h

 // Copyright 2016 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.
 
 #ifndef ASH_COMMON_FRAME_HEADER_VIEW_H_
 #define ASH_COMMON_FRAME_HEADER_VIEW_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
 #include "ash/common/shell_observer.h"
-#include "ash/common/wm/immersive/wm_immersive_fullscreen_controller_delegate.h"
+#include "ash/shared/immersive_fullscreen_controller_delegate.h"
 #include "base/macros.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/views/view.h"
 
 namespace views {
 class ImageView;
 class Widget;
 }
 
 namespace ash {
 
 class DefaultHeaderPainter;
 class FrameCaptionButtonContainerView;
 
 // View which paints the frame header (title, caption buttons...). It slides off
 // and on screen in immersive fullscreen.
 class ASH_EXPORT HeaderView : public views::View,
-                              public WmImmersiveFullscreenControllerDelegate,
+                              public ImmersiveFullscreenControllerDelegate,
                               public ShellObserver {
  public:
   // |target_widget| is the widget that the caption buttons act on.
   // |target_widget| is not necessarily the same as the widget the header is
   // placed in. For example, in immersive fullscreen this view may be painted in
   // a widget that slides in and out on top of the main app or browser window.
   // However, clicking a caption button should act on the target widget.
   explicit HeaderView(views::Widget* target_widget);
   ~HeaderView() override;
 
@@ skipping 29 matching lines @@
   void OnMaximizeModeStarted() override;
   void OnMaximizeModeEnded() override;
 
   FrameCaptionButtonContainerView* caption_button_container() {
     return caption_button_container_;
   }
 
   views::View* avatar_icon() const;
 
  private:
-  // WmImmersiveFullscreenControllerDelegate:
+  // ImmersiveFullscreenControllerDelegate:
   void OnImmersiveRevealStarted() override;
   void OnImmersiveRevealEnded() override;
   void OnImmersiveFullscreenExited() override;
   void SetVisibleFraction(double visible_fraction) override;
   std::vector<gfx::Rect> GetVisibleBoundsInScreen() const override;
 
   // The widget that the caption buttons act on.
   views::Widget* target_widget_;
 
   // Helper for painting the header.
   std::unique_ptr<DefaultHeaderPainter> header_painter_;
 
   views::ImageView* avatar_icon_;
 
   // View which contains the window caption buttons.
   FrameCaptionButtonContainerView* caption_button_container_;
 
   // The fraction of the header's height which is visible while in fullscreen.
   // This value is meaningless when not in fullscreen.
   double fullscreen_visible_fraction_;
 
   DISALLOW_COPY_AND_ASSIGN(HeaderView);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_FRAME_HEADER_VIEW_H_