| Index: ash/shelf/shelf_layout_manager.cc
|
| diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc
|
| index 8db87f4a02eeb3d202f47f5356bed1350505c6b4..b24b89231e6c35869aef49eb046ecd1d93b3d405 100644
|
| --- a/ash/shelf/shelf_layout_manager.cc
|
| +++ b/ash/shelf/shelf_layout_manager.cc
|
| @@ -46,6 +46,7 @@
|
| #include "ui/events/event.h"
|
| #include "ui/events/event_handler.h"
|
| #include "ui/gfx/screen.h"
|
| +#include "ui/keyboard/keyboard_util.h"
|
| #include "ui/views/widget/widget.h"
|
| #include "ui/wm/public/activation_client.h"
|
|
|
| @@ -844,7 +845,7 @@ void ShelfLayoutManager::CalculateTargetBounds(
|
| // remove entirely the dependency on keyboard and dock.
|
|
|
| // Also push in the work area inset for the keyboard if it is visible.
|
| - if (!keyboard_bounds_.IsEmpty()) {
|
| + if (!keyboard_bounds_.IsEmpty() && !keyboard::IsKeyboardOverscrollEnabled()) {
|
| gfx::Insets keyboard_insets(0, 0, keyboard_bounds_.height(), 0);
|
| target_bounds->work_area_insets += keyboard_insets;
|
| }
|
|
|