diff options
| author | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-18 20:03:46 +0000 |
|---|---|---|
| committer | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-18 20:03:46 +0000 |
| commit | e871f1a0bdf9c09b2c72e521b179ebb2fd6dc4e9 (patch) | |
| tree | c97ba41c7fe07b9cffcdc71083bb2f5d58205e85 /ash/wm/stacking_controller.cc | |
| parent | 000d9df01681c4d0fb722c797ba0a398c3756504 (diff) | |
| download | chromium_src-e871f1a0bdf9c09b2c72e521b179ebb2fd6dc4e9.zip chromium_src-e871f1a0bdf9c09b2c72e521b179ebb2fd6dc4e9.tar.gz chromium_src-e871f1a0bdf9c09b2c72e521b179ebb2fd6dc4e9.tar.bz2 | |
Rename system modal types and classes appropriately.
Renames the following as per the bug description by ben@:
kShellWindowId_ModalContainer -> kShellWindowId_SystemModalContainer
kShellWindowId_LockModalContainer -> kShellWindowId_LockSystemModalContainer
ModalContainerLayoutManager->SystemModalContainerLayoutManager
ModalityEventFilter->SystemModalContainerEventFilter
BUG=109460
TEST=All tests and compilation still succeed.
Review URL: https://chromiumcodereview.appspot.com/9249022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118127 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/stacking_controller.cc')
| -rw-r--r-- | ash/wm/stacking_controller.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ash/wm/stacking_controller.cc b/ash/wm/stacking_controller.cc index 08a990b..1bc3c6f 100644 --- a/ash/wm/stacking_controller.cc +++ b/ash/wm/stacking_controller.cc @@ -49,7 +49,7 @@ aura::Window* StackingController::GetDefaultParent(aura::Window* window) { case aura::client::WINDOW_TYPE_NORMAL: case aura::client::WINDOW_TYPE_POPUP: if (IsSystemModal(window)) - return GetModalContainer(window); + return GetSystemModalContainer(window); return always_on_top_controller_->GetContainer(window); case aura::client::WINDOW_TYPE_PANEL: return GetContainer(internal::kShellWindowId_PanelContainer); @@ -67,7 +67,7 @@ aura::Window* StackingController::GetDefaultParent(aura::Window* window) { //////////////////////////////////////////////////////////////////////////////// // StackingController, private: -aura::Window* StackingController::GetModalContainer( +aura::Window* StackingController::GetSystemModalContainer( aura::Window* window) const { if (!IsSystemModal(window)) return NULL; @@ -77,7 +77,7 @@ aura::Window* StackingController::GetModalContainer( aura::Window* lock_container = GetContainer(internal::kShellWindowId_LockScreenContainer); if (!lock_container->children().size()) - return GetContainer(internal::kShellWindowId_ModalContainer); + return GetContainer(internal::kShellWindowId_SystemModalContainer); // Otherwise those that originate from LockScreen container and above are // placed in the screen lock modal container. @@ -86,9 +86,9 @@ aura::Window* StackingController::GetModalContainer( aura::Window* container = NULL; if (window_container_id < lock_container_id) - container = GetContainer(internal::kShellWindowId_ModalContainer); + container = GetContainer(internal::kShellWindowId_SystemModalContainer); else - container = GetContainer(internal::kShellWindowId_LockModalContainer); + container = GetContainer(internal::kShellWindowId_LockSystemModalContainer); return container; } |