Remove docked windows entirely in M59.

ash/common/shelf/shelf_layout_manager.h

 // Copyright 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.
 
 #ifndef ASH_COMMON_SHELF_SHELF_LAYOUT_MANAGER_H_
 #define ASH_COMMON_SHELF_SHELF_LAYOUT_MANAGER_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
 #include "ash/common/session/session_state_observer.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shell_observer.h"
-#include "ash/common/wm/dock/docked_window_layout_manager_observer.h"
 #include "ash/common/wm/lock_state_observer.h"
 #include "ash/common/wm/wm_snap_to_pixel_layout_manager.h"
 #include "ash/common/wm/workspace/workspace_types.h"
 #include "ash/common/wm_activation_observer.h"
 #include "ash/public/cpp/shelf_types.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "base/timer/timer.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/rect.h"
@@ skipping 16 matching lines @@
 // ShelfLayoutManager is the layout manager responsible for the shelf and
 // status widgets. The shelf is given the total available width and told the
 // width of the status area. This allows the shelf to draw the background and
 // layout to the status area.
 // To respond to bounds changes in the status area StatusAreaLayoutManager works
 // closely with ShelfLayoutManager.
 // On mus, widget bounds management is handled by the window manager.
 class ASH_EXPORT ShelfLayoutManager
     : public ShellObserver,
       public WmActivationObserver,
-      public DockedWindowLayoutManagerObserver,
       public keyboard::KeyboardControllerObserver,
       public LockStateObserver,
       public wm::WmSnapToPixelLayoutManager,
       public SessionStateObserver {
  public:
   ShelfLayoutManager(ShelfWidget* shelf_widget, WmShelf* wm_shelf);
   ~ShelfLayoutManager() override;
 
   bool updating_bounds() const { return updating_bounds_; }
 
   // Clears internal data for shutdown process.
   void PrepareForShutdown();
 
   // Returns whether the shelf and its contents (shelf, status) are visible
   // on the screen.
   bool IsVisible() const;
 
   // Returns the ideal bounds of the shelf assuming it is visible.
   gfx::Rect GetIdealBounds();
 
   // Returns the preferred size of the shelf for the target visibility state.
   gfx::Size GetPreferredSize();
 
-  // Returns the docked area bounds.
-  const gfx::Rect& dock_bounds() const { return dock_bounds_; }
-
   // Returns the bounds within the root window not occupied by the shelf nor the
   // virtual keyboard.
   const gfx::Rect& user_work_area_bounds() const {
     return user_work_area_bounds_;
   }
 
   // Stops any animations and sets the bounds of the shelf and status widgets.
   void LayoutShelfAndUpdateBounds(bool change_work_area);
 
   // Stops any animations, sets the bounds of the shelf and status widgets, and
@@ skipping 172 matching lines @@
   // Returns the AutoHideState. This value is determined from the shelf and
   // tray.
   ShelfAutoHideState CalculateAutoHideState(
       ShelfVisibilityState visibility_state) const;
 
   // Returns true if |window| is a descendant of the shelf.
   bool IsShelfWindow(WmWindow* window);
 
   int GetWorkAreaInsets(const State& state, int size) const;
 
-  // Overridden from DockedWindowLayoutManagerObserver:
-  void OnDockBoundsChanging(
-      const gfx::Rect& dock_bounds,
-      DockedWindowLayoutManagerObserver::Reason reason) override;
-
   // Called when the LoginUI changes from visible to invisible.
   void UpdateShelfVisibilityAfterLoginUIChange();
 
   // Compute |target_bounds| opacity based on gesture and shelf visibility.
   float ComputeTargetOpacity(const State& state);
 
   // Returns true if there is a fullscreen window open that causes the shelf
   // to be hidden.
   bool IsShelfHiddenForFullscreen() const;
 
@@ skipping 47 matching lines @@
 
   // Manage the auto-hide state during the gesture.
   ShelfAutoHideState gesture_drag_auto_hide_state_;
 
   // Used to delay updating shelf background.
   UpdateShelfObserver* update_shelf_observer_;
 
   // The bounds of the keyboard.
   gfx::Rect keyboard_bounds_;
 
-  // The bounds of the dock.
-  gfx::Rect dock_bounds_;
-
   // The bounds within the root window not occupied by the shelf nor the virtual
   // keyboard.
   gfx::Rect user_work_area_bounds_;
 
   // The height of the ChromeVox panel at the top of the screen, which
   // needs to be removed from the available work area.
   int chromevox_panel_height_;
 
   // The show hide animation duration override or 0 for default.
   int duration_override_in_ms_;
 
   // The current shelf background. Should not be assigned to directly, use
   // MaybeUpdateShelfBackground() instead.
   ShelfBackgroundType shelf_background_type_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_SHELF_SHELF_LAYOUT_MANAGER_H_