| Index: ash/common/shelf/shelf_layout_manager.h
|
| diff --git a/ash/common/shelf/shelf_layout_manager.h b/ash/common/shelf/shelf_layout_manager.h
|
| index 557f5fd4be91ce1fd77dbf7282a02dbb1743836b..8209e5b93e2ffb297a3a73171058b3295ba7fdc3 100644
|
| --- a/ash/common/shelf/shelf_layout_manager.h
|
| +++ b/ash/common/shelf/shelf_layout_manager.h
|
| @@ -15,7 +15,6 @@
|
| #include "ash/common/wm/background_animator.h"
|
| #include "ash/common/wm/dock/docked_window_layout_manager_observer.h"
|
| #include "ash/common/wm/lock_state_observer.h"
|
| -#include "ash/common/wm/window_state.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"
|
| @@ -293,7 +292,6 @@ class ASH_EXPORT ShelfLayoutManager
|
| // Returns true if there is a fullscreen window open that causes the shelf
|
| // to be hidden.
|
| bool IsShelfHiddenForFullscreen() const;
|
| - ash::wm::WindowState::FullscreenShelfMode GetShelfModeForFullscreen() const;
|
|
|
| // Gesture related functions:
|
| void StartGestureDrag(const ui::GestureEvent& gesture);
|
| @@ -301,8 +299,6 @@ class ASH_EXPORT ShelfLayoutManager
|
| void CompleteGestureDrag(const ui::GestureEvent& gesture);
|
| void CancelGestureDrag();
|
|
|
| - int GetShelfInsetsForAutoHide() const;
|
| -
|
| // True when inside UpdateBoundsAndOpacity() method. Used to prevent calling
|
| // UpdateBoundsAndOpacity() again from SetChildBounds().
|
| bool updating_bounds_;
|
| @@ -368,10 +364,6 @@ class ASH_EXPORT ShelfLayoutManager
|
| // The show hide animation duration override or 0 for default.
|
| int duration_override_in_ms_;
|
|
|
| - // The flag to enforce invisible shelf (as in MD-experiemntal).
|
| - // TODO(oshima): Remove this when MD immersive is launched.
|
| - bool invisible_auto_hide_shelf_ = false;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
|
| };
|
|
|
|
|