OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ash/common/wm/dock/docked_window_layout_manager.h" | 5 #include "ash/common/wm/dock/docked_window_layout_manager.h" |
6 | 6 |
7 #include "ash/common/material_design/material_design_controller.h" | 7 #include "ash/common/material_design/material_design_controller.h" |
8 #include "ash/common/shelf/shelf_background_animator.h" | 8 #include "ash/common/shelf/shelf_background_animator.h" |
9 #include "ash/common/shelf/shelf_background_animator_observer.h" | 9 #include "ash/common/shelf/shelf_background_animator_observer.h" |
10 #include "ash/common/shelf/shelf_constants.h" | 10 #include "ash/common/shelf/shelf_constants.h" |
(...skipping 914 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
925 RestoreDockedWindow(window_state); | 925 RestoreDockedWindow(window_state); |
926 } | 926 } |
927 } | 927 } |
928 } | 928 } |
929 Relayout(); | 929 Relayout(); |
930 UpdateDockBounds(DockedWindowLayoutManagerObserver::CHILD_CHANGED); | 930 UpdateDockBounds(DockedWindowLayoutManagerObserver::CHILD_CHANGED); |
931 } | 931 } |
932 | 932 |
933 void DockedWindowLayoutManager::OnOverviewModeStarting() { | 933 void DockedWindowLayoutManager::OnOverviewModeStarting() { |
934 in_overview_ = true; | 934 in_overview_ = true; |
935 if (!ash::MaterialDesignController::IsOverviewMaterial()) | |
936 return; | |
937 UpdateDockBounds(DockedWindowLayoutManagerObserver::CHILD_CHANGED); | 935 UpdateDockBounds(DockedWindowLayoutManagerObserver::CHILD_CHANGED); |
938 } | 936 } |
939 | 937 |
940 void DockedWindowLayoutManager::OnOverviewModeEnded() { | 938 void DockedWindowLayoutManager::OnOverviewModeEnded() { |
941 in_overview_ = false; | 939 in_overview_ = false; |
942 if (!ash::MaterialDesignController::IsOverviewMaterial()) | |
943 return; | |
944 UpdateDockBounds(DockedWindowLayoutManagerObserver::CHILD_CHANGED); | 940 UpdateDockBounds(DockedWindowLayoutManagerObserver::CHILD_CHANGED); |
945 } | 941 } |
946 | 942 |
947 //////////////////////////////////////////////////////////////////////////////// | 943 //////////////////////////////////////////////////////////////////////////////// |
948 // DockedWindowLayoutManager private implementation: | 944 // DockedWindowLayoutManager private implementation: |
949 | 945 |
950 void DockedWindowLayoutManager::MaybeMinimizeChildrenExcept(WmWindow* child) { | 946 void DockedWindowLayoutManager::MaybeMinimizeChildrenExcept(WmWindow* child) { |
951 WindowSelectorController* window_selector_controller = | 947 WindowSelectorController* window_selector_controller = |
952 WmShell::Get()->window_selector_controller(); | 948 WmShell::Get()->window_selector_controller(); |
953 if (window_selector_controller->IsRestoringMinimizedWindows()) | 949 if (window_selector_controller->IsRestoringMinimizedWindows()) |
(...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1382 const gfx::Rect& keyboard_bounds) { | 1378 const gfx::Rect& keyboard_bounds) { |
1383 // This bounds change will have caused a change to the Shelf which does not | 1379 // This bounds change will have caused a change to the Shelf which does not |
1384 // propagate automatically to this class, so manually recalculate bounds. | 1380 // propagate automatically to this class, so manually recalculate bounds. |
1385 Relayout(); | 1381 Relayout(); |
1386 UpdateDockBounds(DockedWindowLayoutManagerObserver::KEYBOARD_BOUNDS_CHANGING); | 1382 UpdateDockBounds(DockedWindowLayoutManagerObserver::KEYBOARD_BOUNDS_CHANGING); |
1387 } | 1383 } |
1388 | 1384 |
1389 void DockedWindowLayoutManager::OnKeyboardClosed() {} | 1385 void DockedWindowLayoutManager::OnKeyboardClosed() {} |
1390 | 1386 |
1391 } // namespace ash | 1387 } // namespace ash |
OLD | NEW |