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/shell_unittest.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/shell_unittest.cc')
| -rw-r--r-- | ash/shell_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc index 6604799..42de843 100644 --- a/ash/shell_unittest.cc +++ b/ash/shell_unittest.cc @@ -163,7 +163,7 @@ TEST_F(ShellTest, CreateModalWindow) { // It should be in modal container. aura::Window* modal_container = Shell::GetInstance()->GetContainer( - ash::internal::kShellWindowId_ModalContainer); + ash::internal::kShellWindowId_SystemModalContainer); EXPECT_EQ(modal_container, modal_widget->GetNativeWindow()->parent()); modal_widget->Close(); @@ -200,7 +200,7 @@ TEST_F(ShellTest, CreateLockScreenModalWindow) { // It should be in LockScreen modal container. aura::Window* lock_modal_container = Shell::GetInstance()->GetContainer( - ash::internal::kShellWindowId_LockModalContainer); + ash::internal::kShellWindowId_LockSystemModalContainer); EXPECT_EQ(lock_modal_container, lock_modal_widget->GetNativeWindow()->parent()); @@ -211,7 +211,7 @@ TEST_F(ShellTest, CreateLockScreenModalWindow) { // It should be in non-LockScreen modal container. aura::Window* modal_container = Shell::GetInstance()->GetContainer( - ash::internal::kShellWindowId_ModalContainer); + ash::internal::kShellWindowId_SystemModalContainer); EXPECT_EQ(modal_container, modal_widget->GetNativeWindow()->parent()); modal_widget->Close(); |