| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/wm/workspace/workspace_layout_manager.h" | 5 #include "ash/wm/workspace/workspace_layout_manager.h" |
| 6 | 6 |
| 7 #include "ash/display/display_controller.h" | 7 #include "ash/display/display_controller.h" |
| 8 #include "ash/root_window_controller.h" | 8 #include "ash/root_window_controller.h" |
| 9 #include "ash/screen_ash.h" | 9 #include "ash/screen_ash.h" |
| 10 #include "ash/shelf/shelf_layout_manager.h" | 10 #include "ash/shelf/shelf_layout_manager.h" |
| (...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 342 SetChildBoundsDirect(window, new_bounds); | 342 SetChildBoundsDirect(window, new_bounds); |
| 343 else | 343 else |
| 344 CrossFadeToBounds(window, new_bounds); | 344 CrossFadeToBounds(window, new_bounds); |
| 345 break; | 345 break; |
| 346 } | 346 } |
| 347 | 347 |
| 348 case ui::SHOW_STATE_FULLSCREEN: { | 348 case ui::SHOW_STATE_FULLSCREEN: { |
| 349 MoveToDisplayForRestore(window_state); | 349 MoveToDisplayForRestore(window_state); |
| 350 gfx::Rect new_bounds = ScreenAsh::GetDisplayBoundsInParent( | 350 gfx::Rect new_bounds = ScreenAsh::GetDisplayBoundsInParent( |
| 351 window->parent()->parent()); | 351 window->parent()->parent()); |
| 352 if (window->GetProperty(kAnimateToFullscreenKey) && | 352 if (window_state->animate_to_fullscreen() && |
| 353 last_show_state != ui::SHOW_STATE_MINIMIZED) { | 353 last_show_state != ui::SHOW_STATE_MINIMIZED) { |
| 354 CrossFadeToBounds(window, new_bounds); | 354 CrossFadeToBounds(window, new_bounds); |
| 355 } else { | 355 } else { |
| 356 SetChildBoundsDirect(window, new_bounds); | 356 SetChildBoundsDirect(window, new_bounds); |
| 357 } | 357 } |
| 358 break; | 358 break; |
| 359 } | 359 } |
| 360 | 360 |
| 361 default: | 361 default: |
| 362 break; | 362 break; |
| (...skipping 19 matching lines...) Expand all Loading... |
| 382 window_state->window(), | 382 window_state->window(), |
| 383 ScreenAsh::GetDisplayBoundsInParent( | 383 ScreenAsh::GetDisplayBoundsInParent( |
| 384 window_state->window()->parent()->parent())); | 384 window_state->window()->parent()->parent())); |
| 385 return true; | 385 return true; |
| 386 } | 386 } |
| 387 return false; | 387 return false; |
| 388 } | 388 } |
| 389 | 389 |
| 390 } // namespace internal | 390 } // namespace internal |
| 391 } // namespace ash | 391 } // namespace ash |
| OLD | NEW |