Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(175)

Unified Diff: ash/common/shelf/shelf_layout_manager.cc

Issue 2700523004: Remove docked windows entirely in M59. (Closed)
Patch Set: Rebase Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/shelf/shelf_layout_manager.h ('k') | ash/common/shelf/shelf_window_watcher_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 a1b146a650e9db98dbeb2de594b1b3351d4f25e0..e246511f4ba6c978eaae33f7db156f7f815593d0 100644
--- a/ash/common/shelf/shelf_layout_manager.cc
+++ b/ash/common/shelf/shelf_layout_manager.cc
@@ -714,14 +714,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);
@@ -983,20 +975,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
« no previous file with comments | « ash/common/shelf/shelf_layout_manager.h ('k') | ash/common/shelf/shelf_window_watcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698