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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/common/root_window_controller_common.cc

Issue 2035543004: Shuffles and renames ash/common/wm classes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: random changes for chrome tests Created 4 years, 6 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
« ash/aura/wm_root_window_controller_aura.h ('K') | « ash/common/root_window_controller_common.h ('k') | ash/common/wm/always_on_top_controller.h » ('j') | ash/common/wm/default_state.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/root_window_controller_common.cc
diff --git a/ash/common/root_window_controller_common.cc b/ash/common/root_window_controller_common.cc
index 6d35f15772daae41e8756e8a96f4f513a36ad3b9..cfaa065a3597d5047882ab4c879895e4dbbffaf7 100644
--- a/ash/common/root_window_controller_common.cc
+++ b/ash/common/root_window_controller_common.cc
@@ -6,18 +6,16 @@
#include "ash/common/shell_window_ids.h"
#include "ash/common/wm/root_window_layout_manager.h"
-#include "ash/common/wm/wm_globals.h"
-#include "ash/common/wm/wm_window.h"
+#include "ash/common/wm_shell.h"
+#include "ash/common/wm_window.h"
#include "base/memory/ptr_util.h"
namespace ash {
namespace {
// Creates a new window for use as a container.
-wm::WmWindow* CreateContainer(int window_id,
- const char* name,
- wm::WmWindow* parent) {
- wm::WmWindow* window = wm::WmGlobals::Get()->NewContainerWindow();
+WmWindow* CreateContainer(int window_id, const char* name, WmWindow* parent) {
+ WmWindow* window = WmShell::Get()->NewContainerWindow();
window->SetShellWindowId(window_id);
window->SetName(name);
parent->AddChild(window);
@@ -28,7 +26,7 @@ wm::WmWindow* CreateContainer(int window_id,
} // namespace
-RootWindowControllerCommon::RootWindowControllerCommon(wm::WmWindow* root)
+RootWindowControllerCommon::RootWindowControllerCommon(WmWindow* root)
: root_(root), root_window_layout_(nullptr) {}
RootWindowControllerCommon::~RootWindowControllerCommon() {}
@@ -44,169 +42,169 @@ void RootWindowControllerCommon::CreateContainers() {
// When screen is locked desktop background is moved to lock screen background
// container (moved back on unlock). We want to make sure that there's an
// opaque layer occluding the non-lock-screen layers.
- wm::WmWindow* desktop_background_container =
+ WmWindow* desktop_background_container =
CreateContainer(kShellWindowId_DesktopBackgroundContainer,
"DesktopBackgroundContainer", root_);
desktop_background_container->SetChildWindowVisibilityChangesAnimated();
- wm::WmWindow* non_lock_screen_containers =
+ WmWindow* non_lock_screen_containers =
CreateContainer(kShellWindowId_NonLockScreenContainersContainer,
"NonLockScreenContainersContainer", root_);
// Clip all windows inside this container, as half pixel of the window's
// texture may become visible when the screen is scaled. crbug.com/368591.
non_lock_screen_containers->SetMasksToBounds(true);
- wm::WmWindow* lock_background_containers =
+ WmWindow* lock_background_containers =
CreateContainer(kShellWindowId_LockScreenBackgroundContainer,
"LockScreenBackgroundContainer", root_);
lock_background_containers->SetChildWindowVisibilityChangesAnimated();
- wm::WmWindow* lock_screen_containers =
+ WmWindow* lock_screen_containers =
CreateContainer(kShellWindowId_LockScreenContainersContainer,
"LockScreenContainersContainer", root_);
- wm::WmWindow* lock_screen_related_containers =
+ WmWindow* lock_screen_related_containers =
CreateContainer(kShellWindowId_LockScreenRelatedContainersContainer,
"LockScreenRelatedContainersContainer", root_);
CreateContainer(kShellWindowId_UnparentedControlContainer,
"UnparentedControlContainer", non_lock_screen_containers);
- wm::WmWindow* default_container =
+ WmWindow* default_container =
CreateContainer(kShellWindowId_DefaultContainer, "DefaultContainer",
non_lock_screen_containers);
default_container->SetChildWindowVisibilityChangesAnimated();
default_container->SetSnapsChildrenToPhysicalPixelBoundary();
default_container->SetBoundsInScreenBehaviorForChildren(
- wm::WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES);
+ WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES);
default_container->SetChildrenUseExtendedHitRegion();
- wm::WmWindow* always_on_top_container =
+ WmWindow* always_on_top_container =
CreateContainer(kShellWindowId_AlwaysOnTopContainer,
"AlwaysOnTopContainer", non_lock_screen_containers);
always_on_top_container->SetChildWindowVisibilityChangesAnimated();
always_on_top_container->SetSnapsChildrenToPhysicalPixelBoundary();
always_on_top_container->SetBoundsInScreenBehaviorForChildren(
- wm::WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES);
+ WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES);
- wm::WmWindow* docked_container =
+ WmWindow* docked_container =
CreateContainer(kShellWindowId_DockedContainer, "DockedContainer",
non_lock_screen_containers);
docked_container->SetChildWindowVisibilityChangesAnimated();
docked_container->SetSnapsChildrenToPhysicalPixelBoundary();
docked_container->SetBoundsInScreenBehaviorForChildren(
- wm::WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES);
+ WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES);
docked_container->SetChildrenUseExtendedHitRegion();
- wm::WmWindow* shelf_container =
+ WmWindow* shelf_container =
CreateContainer(kShellWindowId_ShelfContainer, "ShelfContainer",
non_lock_screen_containers);
shelf_container->SetSnapsChildrenToPhysicalPixelBoundary();
shelf_container->SetBoundsInScreenBehaviorForChildren(
- wm::WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES);
+ WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES);
shelf_container->SetDescendantsStayInSameRootWindow(true);
- wm::WmWindow* panel_container =
+ WmWindow* panel_container =
CreateContainer(kShellWindowId_PanelContainer, "PanelContainer",
non_lock_screen_containers);
panel_container->SetSnapsChildrenToPhysicalPixelBoundary();
panel_container->SetBoundsInScreenBehaviorForChildren(
- wm::WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES);
+ WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES);
- wm::WmWindow* shelf_bubble_container =
+ WmWindow* shelf_bubble_container =
CreateContainer(kShellWindowId_ShelfBubbleContainer,
"ShelfBubbleContainer", non_lock_screen_containers);
shelf_bubble_container->SetSnapsChildrenToPhysicalPixelBoundary();
shelf_bubble_container->SetBoundsInScreenBehaviorForChildren(
- wm::WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES);
+ WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES);
shelf_bubble_container->SetDescendantsStayInSameRootWindow(true);
- wm::WmWindow* app_list_container =
+ WmWindow* app_list_container =
CreateContainer(kShellWindowId_AppListContainer, "AppListContainer",
non_lock_screen_containers);
app_list_container->SetSnapsChildrenToPhysicalPixelBoundary();
app_list_container->SetBoundsInScreenBehaviorForChildren(
- wm::WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES);
+ WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES);
- wm::WmWindow* modal_container =
+ WmWindow* modal_container =
CreateContainer(kShellWindowId_SystemModalContainer,
"SystemModalContainer", non_lock_screen_containers);
modal_container->SetSnapsChildrenToPhysicalPixelBoundary();
modal_container->SetChildWindowVisibilityChangesAnimated();
modal_container->SetBoundsInScreenBehaviorForChildren(
- wm::WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES);
+ WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES);
modal_container->SetChildrenUseExtendedHitRegion();
// TODO(beng): Figure out if we can make this use
// SystemModalContainerEventFilter instead of stops_event_propagation.
- wm::WmWindow* lock_container =
+ WmWindow* lock_container =
CreateContainer(kShellWindowId_LockScreenContainer, "LockScreenContainer",
lock_screen_containers);
lock_container->SetSnapsChildrenToPhysicalPixelBoundary();
lock_container->SetBoundsInScreenBehaviorForChildren(
- wm::WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES);
+ WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES);
// TODO(beng): stopsevents
- wm::WmWindow* lock_modal_container =
+ WmWindow* lock_modal_container =
CreateContainer(kShellWindowId_LockSystemModalContainer,
"LockSystemModalContainer", lock_screen_containers);
lock_modal_container->SetSnapsChildrenToPhysicalPixelBoundary();
lock_modal_container->SetChildWindowVisibilityChangesAnimated();
lock_modal_container->SetBoundsInScreenBehaviorForChildren(
- wm::WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES);
+ WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES);
lock_modal_container->SetChildrenUseExtendedHitRegion();
- wm::WmWindow* status_container =
+ WmWindow* status_container =
CreateContainer(kShellWindowId_StatusContainer, "StatusContainer",
lock_screen_related_containers);
status_container->SetSnapsChildrenToPhysicalPixelBoundary();
status_container->SetBoundsInScreenBehaviorForChildren(
- wm::WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES);
+ WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES);
status_container->SetDescendantsStayInSameRootWindow(true);
- wm::WmWindow* settings_bubble_container =
+ WmWindow* settings_bubble_container =
CreateContainer(kShellWindowId_SettingBubbleContainer,
"SettingBubbleContainer", lock_screen_related_containers);
settings_bubble_container->SetChildWindowVisibilityChangesAnimated();
settings_bubble_container->SetSnapsChildrenToPhysicalPixelBoundary();
settings_bubble_container->SetBoundsInScreenBehaviorForChildren(
- wm::WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES);
+ WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES);
settings_bubble_container->SetDescendantsStayInSameRootWindow(true);
- wm::WmWindow* virtual_keyboard_parent_container = CreateContainer(
+ WmWindow* virtual_keyboard_parent_container = CreateContainer(
kShellWindowId_ImeWindowParentContainer, "VirtualKeyboardParentContainer",
lock_screen_related_containers);
virtual_keyboard_parent_container->SetSnapsChildrenToPhysicalPixelBoundary();
virtual_keyboard_parent_container->SetBoundsInScreenBehaviorForChildren(
- wm::WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES);
+ WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES);
- wm::WmWindow* menu_container =
+ WmWindow* menu_container =
CreateContainer(kShellWindowId_MenuContainer, "MenuContainer",
lock_screen_related_containers);
menu_container->SetChildWindowVisibilityChangesAnimated();
menu_container->SetSnapsChildrenToPhysicalPixelBoundary();
menu_container->SetBoundsInScreenBehaviorForChildren(
- wm::WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES);
+ WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES);
- wm::WmWindow* drag_drop_container = CreateContainer(
+ WmWindow* drag_drop_container = CreateContainer(
kShellWindowId_DragImageAndTooltipContainer,
"DragImageAndTooltipContainer", lock_screen_related_containers);
drag_drop_container->SetChildWindowVisibilityChangesAnimated();
drag_drop_container->SetSnapsChildrenToPhysicalPixelBoundary();
drag_drop_container->SetBoundsInScreenBehaviorForChildren(
- wm::WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES);
+ WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES);
- wm::WmWindow* overlay_container =
+ WmWindow* overlay_container =
CreateContainer(kShellWindowId_OverlayContainer, "OverlayContainer",
lock_screen_related_containers);
overlay_container->SetSnapsChildrenToPhysicalPixelBoundary();
overlay_container->SetBoundsInScreenBehaviorForChildren(
- wm::WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES);
+ WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES);
#if defined(OS_CHROMEOS)
- wm::WmWindow* mouse_cursor_container = CreateContainer(
+ WmWindow* mouse_cursor_container = CreateContainer(
kShellWindowId_MouseCursorContainer, "MouseCursorContainer", root_);
mouse_cursor_container->SetBoundsInScreenBehaviorForChildren(
- wm::WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES);
+ WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES);
#endif
CreateContainer(kShellWindowId_PowerButtonAnimationContainer,
« ash/aura/wm_root_window_controller_aura.h ('K') | « ash/common/root_window_controller_common.h ('k') | ash/common/wm/always_on_top_controller.h » ('j') | ash/common/wm/default_state.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698