diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-16 04:28:37 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-16 04:28:37 +0000 |
| commit | 932cf113991a891486faaba65f2d266afa023906 (patch) | |
| tree | 414e932123fb1ba19e287f1c404c1a2562e1c3e6 /ash/focus_cycler_unittest.cc | |
| parent | ff5692ed360a1e71ca3ba7d3be29a930f7e25dec (diff) | |
| download | chromium_src-932cf113991a891486faaba65f2d266afa023906.zip chromium_src-932cf113991a891486faaba65f2d266afa023906.tar.gz chromium_src-932cf113991a891486faaba65f2d266afa023906.tar.bz2 | |
Prepare a bunch of ash tests for workspace2. With Workspace2 you can't
add to the default container, instead you need to go through the
StackingClient.
BUG=137342
TEST=none
R=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10857021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151848 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/focus_cycler_unittest.cc')
| -rw-r--r-- | ash/focus_cycler_unittest.cc | 30 |
1 files changed, 6 insertions, 24 deletions
diff --git a/ash/focus_cycler_unittest.cc b/ash/focus_cycler_unittest.cc index d0377a2..19166a0 100644 --- a/ash/focus_cycler_unittest.cc +++ b/ash/focus_cycler_unittest.cc @@ -48,10 +48,7 @@ TEST_F(FocusCyclerTest, CycleFocusBrowserOnly) { scoped_ptr<FocusCycler> focus_cycler(new FocusCycler()); // Create a single test window. - Window* default_container = Shell::GetContainer( - Shell::GetPrimaryRootWindow(), - internal::kShellWindowId_DefaultContainer); - scoped_ptr<Window> window0(CreateTestWindowWithId(0, default_container)); + scoped_ptr<Window> window0(CreateTestWindowWithId(0, NULL)); wm::ActivateWindow(window0.get()); EXPECT_TRUE(wm::IsActiveWindow(window0.get())); @@ -78,10 +75,7 @@ TEST_F(FocusCyclerTest, CycleFocusForward) { launcher->SetFocusCycler(focus_cycler.get()); // Create a single test window. - Window* default_container = Shell::GetContainer( - Shell::GetPrimaryRootWindow(), - internal::kShellWindowId_DefaultContainer); - scoped_ptr<Window> window0(CreateTestWindowWithId(0, default_container)); + scoped_ptr<Window> window0(CreateTestWindowWithId(0, NULL)); wm::ActivateWindow(window0.get()); EXPECT_TRUE(wm::IsActiveWindow(window0.get())); @@ -116,10 +110,7 @@ TEST_F(FocusCyclerTest, CycleFocusBackward) { launcher->SetFocusCycler(focus_cycler.get()); // Create a single test window. - Window* default_container = Shell::GetContainer( - Shell::GetPrimaryRootWindow(), - internal::kShellWindowId_DefaultContainer); - scoped_ptr<Window> window0(CreateTestWindowWithId(0, default_container)); + scoped_ptr<Window> window0(CreateTestWindowWithId(0, NULL)); wm::ActivateWindow(window0.get()); EXPECT_TRUE(wm::IsActiveWindow(window0.get())); @@ -154,10 +145,7 @@ TEST_F(FocusCyclerTest, CycleFocusForwardBackward) { launcher->SetFocusCycler(focus_cycler.get()); // Create a single test window. - Window* default_container = Shell::GetContainer( - Shell::GetPrimaryRootWindow(), - internal::kShellWindowId_DefaultContainer); - scoped_ptr<Window> window0(CreateTestWindowWithId(0, default_container)); + scoped_ptr<Window> window0(CreateTestWindowWithId(0, NULL)); wm::ActivateWindow(window0.get()); EXPECT_TRUE(wm::IsActiveWindow(window0.get())); @@ -274,10 +262,7 @@ TEST_F(FocusCyclerLauncherTest, CycleFocusForwardInvisible) { launcher->SetFocusCycler(focus_cycler.get()); // Create a single test window. - Window* default_container = Shell::GetContainer( - Shell::GetPrimaryRootWindow(), - internal::kShellWindowId_DefaultContainer); - scoped_ptr<Window> window0(CreateTestWindowWithId(0, default_container)); + scoped_ptr<Window> window0(CreateTestWindowWithId(0, NULL)); wm::ActivateWindow(window0.get()); EXPECT_TRUE(wm::IsActiveWindow(window0.get())); @@ -308,10 +293,7 @@ TEST_F(FocusCyclerLauncherTest, CycleFocusBackwardInvisible) { launcher->SetFocusCycler(focus_cycler.get()); // Create a single test window. - Window* default_container = Shell::GetInstance()->GetContainer( - Shell::GetPrimaryRootWindow(), - internal::kShellWindowId_DefaultContainer); - scoped_ptr<Window> window0(CreateTestWindowWithId(0, default_container)); + scoped_ptr<Window> window0(CreateTestWindowWithId(0, NULL)); wm::ActivateWindow(window0.get()); EXPECT_TRUE(wm::IsActiveWindow(window0.get())); |