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

Unified Diff: ash/root_window_controller.cc

Issue 11316245: Move VisibilityController to corewm. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month 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
« no previous file with comments | « ash/ash.gyp ('k') | ash/shell.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/root_window_controller.cc
===================================================================
--- ash/root_window_controller.cc (revision 170313)
+++ ash/root_window_controller.cc (working copy)
@@ -30,7 +30,6 @@
#include "ash/wm/system_background_controller.h"
#include "ash/wm/system_modal_container_layout_manager.h"
#include "ash/wm/toplevel_window_event_handler.h"
-#include "ash/wm/visibility_controller.h"
#include "ash/wm/window_properties.h"
#include "ash/wm/workspace_controller.h"
#include "base/command_line.h"
@@ -49,6 +48,7 @@
#include "ui/gfx/screen.h"
#include "ui/views/controls/menu/menu_model_adapter.h"
#include "ui/views/controls/menu/menu_runner.h"
+#include "ui/views/corewm/visibility_controller.h"
#include "ui/views/view_model.h"
#include "ui/views/view_model_utils.h"
@@ -516,7 +516,8 @@
kShellWindowId_DesktopBackgroundContainer,
"DesktopBackgroundContainer",
root_window);
- SetChildWindowVisibilityChangesAnimated(desktop_background_container);
+ views::corewm::SetChildWindowVisibilityChangesAnimated(
+ desktop_background_container);
aura::Window* non_lock_screen_containers = CreateContainer(
kShellWindowId_NonLockScreenContainersContainer,
@@ -527,7 +528,8 @@
kShellWindowId_LockScreenBackgroundContainer,
"LockScreenBackgroundContainer",
root_window);
- SetChildWindowVisibilityChangesAnimated(lock_background_containers);
+ views::corewm::SetChildWindowVisibilityChangesAnimated(
+ lock_background_containers);
aura::Window* lock_screen_containers = CreateContainer(
kShellWindowId_LockScreenContainersContainer,
@@ -546,7 +548,7 @@
kShellWindowId_DefaultContainer,
"DefaultContainer",
non_lock_screen_containers);
- SetChildWindowVisibilityChangesAnimated(default_container);
+ views::corewm::SetChildWindowVisibilityChangesAnimated(default_container);
SetUsesScreenCoordinates(default_container);
aura::Window* always_on_top_container = CreateContainer(
@@ -555,7 +557,8 @@
non_lock_screen_containers);
always_on_top_container_handler_.reset(
new ToplevelWindowEventHandler(always_on_top_container));
- SetChildWindowVisibilityChangesAnimated(always_on_top_container);
+ views::corewm::SetChildWindowVisibilityChangesAnimated(
+ always_on_top_container);
SetUsesScreenCoordinates(always_on_top_container);
aura::Window* panel_container = CreateContainer(
@@ -584,7 +587,7 @@
new ToplevelWindowEventHandler(modal_container));
modal_container->SetLayoutManager(
new SystemModalContainerLayoutManager(modal_container));
- SetChildWindowVisibilityChangesAnimated(modal_container);
+ views::corewm::SetChildWindowVisibilityChangesAnimated(modal_container);
SetUsesScreenCoordinates(modal_container);
aura::Window* input_method_container = CreateContainer(
@@ -612,7 +615,7 @@
new ToplevelWindowEventHandler(lock_modal_container));
lock_modal_container->SetLayoutManager(
new SystemModalContainerLayoutManager(lock_modal_container));
- SetChildWindowVisibilityChangesAnimated(lock_modal_container);
+ views::corewm::SetChildWindowVisibilityChangesAnimated(lock_modal_container);
SetUsesScreenCoordinates(lock_modal_container);
aura::Window* status_container =
@@ -625,21 +628,22 @@
kShellWindowId_SettingBubbleContainer,
"SettingBubbleContainer",
lock_screen_related_containers);
- SetChildWindowVisibilityChangesAnimated(settings_bubble_container);
+ views::corewm::SetChildWindowVisibilityChangesAnimated(
+ settings_bubble_container);
SetUsesScreenCoordinates(settings_bubble_container);
aura::Window* menu_container = CreateContainer(
kShellWindowId_MenuContainer,
"MenuContainer",
lock_screen_related_containers);
- SetChildWindowVisibilityChangesAnimated(menu_container);
+ views::corewm::SetChildWindowVisibilityChangesAnimated(menu_container);
SetUsesScreenCoordinates(menu_container);
aura::Window* drag_drop_container = CreateContainer(
kShellWindowId_DragImageAndTooltipContainer,
"DragImageAndTooltipContainer",
lock_screen_related_containers);
- SetChildWindowVisibilityChangesAnimated(drag_drop_container);
+ views::corewm::SetChildWindowVisibilityChangesAnimated(drag_drop_container);
SetUsesScreenCoordinates(drag_drop_container);
aura::Window* overlay_container = CreateContainer(
« no previous file with comments | « ash/ash.gyp ('k') | ash/shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698