| Index: ash/common/shelf/shelf_layout_manager.cc
|
| diff --git a/ash/common/shelf/shelf_layout_manager.cc b/ash/common/shelf/shelf_layout_manager.cc
|
| index 35de24c20de2088de87458b55086224cbc0b5725..f877921c24f63090aa5e45ae11e872b0c6dbcad7 100644
|
| --- a/ash/common/shelf/shelf_layout_manager.cc
|
| +++ b/ash/common/shelf/shelf_layout_manager.cc
|
| @@ -703,14 +703,6 @@ void ShelfLayoutManager::CalculateTargetBounds(const State& state,
|
| target_bounds->work_area_insets += keyboard_insets;
|
| }
|
|
|
| - // Also push in the work area inset for the dock if it is visible.
|
| - if (!dock_bounds_.IsEmpty()) {
|
| - gfx::Insets dock_insets(
|
| - 0, (dock_bounds_.x() > 0 ? 0 : dock_bounds_.width()), 0,
|
| - (dock_bounds_.x() > 0 ? dock_bounds_.width() : 0));
|
| - target_bounds->work_area_insets += dock_insets;
|
| - }
|
| -
|
| // Also push in the work area insets for the ChromeVox panel if it's visible.
|
| if (chromevox_panel_height_) {
|
| gfx::Insets chromevox_insets(chromevox_panel_height_, 0, 0, 0);
|
| @@ -972,20 +964,6 @@ int ShelfLayoutManager::GetWorkAreaInsets(const State& state, int size) const {
|
| return 0;
|
| }
|
|
|
| -void ShelfLayoutManager::OnDockBoundsChanging(
|
| - const gfx::Rect& dock_bounds,
|
| - DockedWindowLayoutManagerObserver::Reason reason) {
|
| - // Skip shelf layout in case docked notification originates from this class.
|
| - if (reason == DISPLAY_INSETS_CHANGED)
|
| - return;
|
| - if (dock_bounds_ != dock_bounds) {
|
| - dock_bounds_ = dock_bounds;
|
| - OnWindowResized();
|
| - UpdateVisibilityState();
|
| - MaybeUpdateShelfBackground(AnimationChangeType::ANIMATE);
|
| - }
|
| -}
|
| -
|
| void ShelfLayoutManager::OnLockStateEvent(LockStateObserver::EventType event) {
|
| if (event == EVENT_LOCK_ANIMATION_STARTED) {
|
| // Enter the screen locked state and update the visibility to avoid an odd
|
|
|