ash/focus_cycler_unittest.cc - Issue 11017079: Remove Shell::shelf()|status_area_widget()|launcher()

Unified Diff: ash/focus_cycler_unittest.cc

Issue 11017079: Remove Shell::shelf()|status_area_widget()|launcher() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 2 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

Index: ash/focus_cycler_unittest.cc

diff --git a/ash/focus_cycler_unittest.cc b/ash/focus_cycler_unittest.cc

index 19166a0d1727d90bf260575a48d8187dd0e64370..f694f45fb464caa183df7ab111cea0eccab80061 100644

--- a/ash/focus_cycler_unittest.cc

+++ b/ash/focus_cycler_unittest.cc

@@ -68,7 +68,7 @@ TEST_F(FocusCyclerTest, CycleFocusForward) {

focus_cycler.get());

// Add the launcher

- Launcher* launcher = Shell::GetInstance()->launcher();

+ Launcher* launcher = Launcher::ForPrimaryDisplay();

ASSERT_TRUE(launcher);

views::Widget* launcher_widget = launcher->widget();

ASSERT_TRUE(launcher_widget);

@@ -103,7 +103,7 @@ TEST_F(FocusCyclerTest, CycleFocusBackward) {

focus_cycler.get());

// Add the launcher

- Launcher* launcher = Shell::GetInstance()->launcher();

+ Launcher* launcher = Launcher::ForPrimaryDisplay();

ASSERT_TRUE(launcher);

views::Widget* launcher_widget = launcher->widget();

ASSERT_TRUE(launcher_widget);

@@ -138,7 +138,7 @@ TEST_F(FocusCyclerTest, CycleFocusForwardBackward) {

focus_cycler.get());

// Add the launcher

- Launcher* launcher = Shell::GetInstance()->launcher();

+ Launcher* launcher = Launcher::ForPrimaryDisplay();

ASSERT_TRUE(launcher);

views::Widget* launcher_widget = launcher->widget();

ASSERT_TRUE(launcher_widget);

@@ -185,7 +185,7 @@ TEST_F(FocusCyclerTest, CycleFocusNoBrowser) {

focus_cycler.get());

// Add the launcher and focus it

- Launcher* launcher = Shell::GetInstance()->launcher();

+ Launcher* launcher = Launcher::ForPrimaryDisplay();

ASSERT_TRUE(launcher);

views::Widget* launcher_widget = launcher->widget();

ASSERT_TRUE(launcher_widget);

@@ -222,7 +222,7 @@ class FocusCyclerLauncherTest : public AshTestBase {

AshTestBase::SetUp();

// Hide the launcher

- Launcher* launcher = Shell::GetInstance()->launcher();

+ Launcher* launcher = Launcher::ForPrimaryDisplay();

ASSERT_TRUE(launcher);

views::Widget* launcher_widget = launcher->widget();

ASSERT_TRUE(launcher_widget);

@@ -231,7 +231,7 @@ class FocusCyclerLauncherTest : public AshTestBase {

virtual void TearDown() OVERRIDE {

// Show the launcher

- Launcher* launcher = Shell::GetInstance()->launcher();

+ Launcher* launcher = Launcher::ForPrimaryDisplay();

ASSERT_TRUE(launcher);

views::Widget* launcher_widget = launcher->widget();

ASSERT_TRUE(launcher_widget);

@@ -255,7 +255,7 @@ TEST_F(FocusCyclerLauncherTest, CycleFocusForwardInvisible) {

focus_cycler.get());

// Add the launcher

- Launcher* launcher = Shell::GetInstance()->launcher();

+ Launcher* launcher = Launcher::ForPrimaryDisplay();

ASSERT_TRUE(launcher);

views::Widget* launcher_widget = launcher->widget();

ASSERT_TRUE(launcher_widget);

@@ -286,7 +286,7 @@ TEST_F(FocusCyclerLauncherTest, CycleFocusBackwardInvisible) {

focus_cycler.get());

// Add the launcher

- Launcher* launcher = Shell::GetInstance()->launcher();

+ Launcher* launcher = Launcher::ForPrimaryDisplay();

ASSERT_TRUE(launcher);

views::Widget* launcher_widget = launcher->widget();

ASSERT_TRUE(launcher_widget);

« no previous file with comments | « ash/display/display_controller_unittest.cc ('k') | ash/launcher/launcher.h » ('j') | ash/launcher/launcher.h » ('J')