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/root_window_controller.h" | 5 #include "ash/root_window_controller.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "ash/ash_constants.h" | 9 #include "ash/ash_constants.h" |
10 #include "ash/ash_switches.h" | 10 #include "ash/ash_switches.h" |
(...skipping 17 matching lines...) Expand all Loading... |
28 #include "ash/wm/panels/panel_layout_manager.h" | 28 #include "ash/wm/panels/panel_layout_manager.h" |
29 #include "ash/wm/property_util.h" | 29 #include "ash/wm/property_util.h" |
30 #include "ash/wm/root_window_layout_manager.h" | 30 #include "ash/wm/root_window_layout_manager.h" |
31 #include "ash/wm/screen_dimmer.h" | 31 #include "ash/wm/screen_dimmer.h" |
32 #include "ash/wm/stacking_controller.h" | 32 #include "ash/wm/stacking_controller.h" |
33 #include "ash/wm/status_area_layout_manager.h" | 33 #include "ash/wm/status_area_layout_manager.h" |
34 #include "ash/wm/system_background_controller.h" | 34 #include "ash/wm/system_background_controller.h" |
35 #include "ash/wm/system_modal_container_layout_manager.h" | 35 #include "ash/wm/system_modal_container_layout_manager.h" |
36 #include "ash/wm/toplevel_window_event_handler.h" | 36 #include "ash/wm/toplevel_window_event_handler.h" |
37 #include "ash/wm/window_properties.h" | 37 #include "ash/wm/window_properties.h" |
| 38 #include "ash/wm/window_util.h" |
38 #include "ash/wm/workspace_controller.h" | 39 #include "ash/wm/workspace_controller.h" |
39 #include "base/command_line.h" | 40 #include "base/command_line.h" |
40 #include "base/time.h" | 41 #include "base/time.h" |
41 #include "ui/aura/client/aura_constants.h" | 42 #include "ui/aura/client/aura_constants.h" |
42 #include "ui/aura/client/tooltip_client.h" | 43 #include "ui/aura/client/tooltip_client.h" |
43 #include "ui/aura/root_window.h" | 44 #include "ui/aura/root_window.h" |
44 #include "ui/aura/window.h" | 45 #include "ui/aura/window.h" |
45 #include "ui/aura/window_observer.h" | 46 #include "ui/aura/window_observer.h" |
46 #include "ui/base/models/menu_model.h" | 47 #include "ui/base/models/menu_model.h" |
47 #include "ui/gfx/display.h" | 48 #include "ui/gfx/display.h" |
(...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
438 return; | 439 return; |
439 } | 440 } |
440 | 441 |
441 Shell::GetInstance()->UpdateShelfVisibility(); | 442 Shell::GetInstance()->UpdateShelfVisibility(); |
442 } | 443 } |
443 | 444 |
444 void RootWindowController::UpdateShelfVisibility() { | 445 void RootWindowController::UpdateShelfVisibility() { |
445 shelf_->shelf_layout_manager()->UpdateVisibilityState(); | 446 shelf_->shelf_layout_manager()->UpdateVisibilityState(); |
446 } | 447 } |
447 | 448 |
448 bool RootWindowController::IsImmersiveMode() const { | 449 aura::Window* RootWindowController::GetFullscreenWindow() const { |
449 aura::Window* container = workspace_controller_->GetActiveWorkspaceWindow(); | 450 aura::Window* container = workspace_controller_->GetActiveWorkspaceWindow(); |
450 for (size_t i = 0; i < container->children().size(); ++i) { | 451 for (size_t i = 0; i < container->children().size(); ++i) { |
451 aura::Window* child = container->children()[i]; | 452 aura::Window* child = container->children()[i]; |
452 if (child->IsVisible() && child->GetProperty(kImmersiveModeKey)) | 453 if (ash::wm::IsWindowFullscreen(child)) |
453 return true; | 454 return child; |
454 } | 455 } |
455 return false; | 456 return NULL; |
456 } | 457 } |
457 | 458 |
458 void RootWindowController::InitKeyboard() { | 459 void RootWindowController::InitKeyboard() { |
459 if (keyboard::IsKeyboardEnabled()) { | 460 if (keyboard::IsKeyboardEnabled()) { |
460 aura::Window* parent = root_window(); | 461 aura::Window* parent = root_window(); |
461 | 462 |
462 keyboard::KeyboardControllerProxy* proxy = | 463 keyboard::KeyboardControllerProxy* proxy = |
463 Shell::GetInstance()->delegate()->CreateKeyboardControllerProxy(); | 464 Shell::GetInstance()->delegate()->CreateKeyboardControllerProxy(); |
464 keyboard_controller_.reset( | 465 keyboard_controller_.reset( |
465 new keyboard::KeyboardController(proxy)); | 466 new keyboard::KeyboardController(proxy)); |
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
629 "OverlayContainer", | 630 "OverlayContainer", |
630 lock_screen_related_containers); | 631 lock_screen_related_containers); |
631 SetUsesScreenCoordinates(overlay_container); | 632 SetUsesScreenCoordinates(overlay_container); |
632 | 633 |
633 CreateContainer(kShellWindowId_PowerButtonAnimationContainer, | 634 CreateContainer(kShellWindowId_PowerButtonAnimationContainer, |
634 "PowerButtonAnimationContainer", root_window) ; | 635 "PowerButtonAnimationContainer", root_window) ; |
635 } | 636 } |
636 | 637 |
637 } // namespace internal | 638 } // namespace internal |
638 } // namespace ash | 639 } // namespace ash |
OLD | NEW |