| 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 <queue> | 7 #include <queue> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "ash/ash_constants.h" | 10 #include "ash/ash_constants.h" |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 #include "ui/aura/window_tracker.h" | 58 #include "ui/aura/window_tracker.h" |
| 59 #include "ui/base/hit_test.h" | 59 #include "ui/base/hit_test.h" |
| 60 #include "ui/base/models/menu_model.h" | 60 #include "ui/base/models/menu_model.h" |
| 61 #include "ui/gfx/display.h" | 61 #include "ui/gfx/display.h" |
| 62 #include "ui/gfx/screen.h" | 62 #include "ui/gfx/screen.h" |
| 63 #include "ui/keyboard/keyboard_controller.h" | 63 #include "ui/keyboard/keyboard_controller.h" |
| 64 #include "ui/keyboard/keyboard_util.h" | 64 #include "ui/keyboard/keyboard_util.h" |
| 65 #include "ui/views/controls/menu/menu_runner.h" | 65 #include "ui/views/controls/menu/menu_runner.h" |
| 66 #include "ui/views/corewm/capture_controller.h" | 66 #include "ui/views/corewm/capture_controller.h" |
| 67 #include "ui/views/corewm/visibility_controller.h" | 67 #include "ui/views/corewm/visibility_controller.h" |
| 68 #include "ui/views/corewm/window_util.h" |
| 68 #include "ui/views/view_model.h" | 69 #include "ui/views/view_model.h" |
| 69 #include "ui/views/view_model_utils.h" | 70 #include "ui/views/view_model_utils.h" |
| 70 #include "ui/wm/public/easy_resize_window_targeter.h" | 71 #include "ui/wm/public/easy_resize_window_targeter.h" |
| 71 #include "ui/wm/public/window_types.h" | 72 #include "ui/wm/public/window_types.h" |
| 72 | 73 |
| 73 #if defined(OS_CHROMEOS) | 74 #if defined(OS_CHROMEOS) |
| 74 #include "ash/wm/boot_splash_screen_chromeos.h" | 75 #include "ash/wm/boot_splash_screen_chromeos.h" |
| 75 #endif | 76 #endif |
| 76 | 77 |
| 77 namespace ash { | 78 namespace ash { |
| (...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 582 if (((*iter)->type() == ui::wm::WINDOW_TYPE_NORMAL || | 583 if (((*iter)->type() == ui::wm::WINDOW_TYPE_NORMAL || |
| 583 (*iter)->type() == ui::wm::WINDOW_TYPE_PANEL) && | 584 (*iter)->type() == ui::wm::WINDOW_TYPE_PANEL) && |
| 584 (*iter)->layer()->GetTargetVisibility()) { | 585 (*iter)->layer()->GetTargetVisibility()) { |
| 585 topmost_window = *iter; | 586 topmost_window = *iter; |
| 586 break; | 587 break; |
| 587 } | 588 } |
| 588 } | 589 } |
| 589 while (topmost_window) { | 590 while (topmost_window) { |
| 590 if (wm::GetWindowState(topmost_window)->IsFullscreen()) | 591 if (wm::GetWindowState(topmost_window)->IsFullscreen()) |
| 591 return topmost_window; | 592 return topmost_window; |
| 592 topmost_window = topmost_window->transient_parent(); | 593 topmost_window = views::corewm::GetTransientParent(topmost_window); |
| 593 } | 594 } |
| 594 return NULL; | 595 return NULL; |
| 595 } | 596 } |
| 596 | 597 |
| 597 void RootWindowController::ActivateKeyboard( | 598 void RootWindowController::ActivateKeyboard( |
| 598 keyboard::KeyboardController* keyboard_controller) { | 599 keyboard::KeyboardController* keyboard_controller) { |
| 599 if (!keyboard::IsKeyboardEnabled() || | 600 if (!keyboard::IsKeyboardEnabled() || |
| 600 GetContainer(kShellWindowId_VirtualKeyboardContainer)) { | 601 GetContainer(kShellWindowId_VirtualKeyboardContainer)) { |
| 601 return; | 602 return; |
| 602 } | 603 } |
| (...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 992 DisableTouchHudProjection(); | 993 DisableTouchHudProjection(); |
| 993 } | 994 } |
| 994 | 995 |
| 995 RootWindowController* GetRootWindowController( | 996 RootWindowController* GetRootWindowController( |
| 996 const aura::Window* root_window) { | 997 const aura::Window* root_window) { |
| 997 return root_window ? GetRootWindowSettings(root_window)->controller : NULL; | 998 return root_window ? GetRootWindowSettings(root_window)->controller : NULL; |
| 998 } | 999 } |
| 999 | 1000 |
| 1000 } // namespace internal | 1001 } // namespace internal |
| 1001 } // namespace ash | 1002 } // namespace ash |
| OLD | NEW |