diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-19 04:19:38 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-19 04:19:38 +0000 |
| commit | 864b5855c27945ea0f099bf82d44f41a041851ff (patch) | |
| tree | 8f3737b10405128113a113f373f4472727f149de /ash/focus_cycler_unittest.cc | |
| parent | 7a22adbf507b6f35788ea89f12bbd2c1b96d451b (diff) | |
| download | chromium_src-864b5855c27945ea0f099bf82d44f41a041851ff.zip chromium_src-864b5855c27945ea0f099bf82d44f41a041851ff.tar.gz chromium_src-864b5855c27945ea0f099bf82d44f41a041851ff.tar.bz2 | |
Rename Launcher to Shelf.
- move launcher* from launcher to shelf.
- rename to launcher.* to shelf.* and launcher_unittest.cc to
shelf_unittest.cc
- rename LauncherTestAPI to ShelfTestAPI.
- rename to launcher_test_api.* to shelf_test_api.*
BUG=248353
TEST=None, no functional changes
R=jamescook@chromium.org,harrym@chromium.org
TBR=sky
Review URL: https://codereview.chromium.org/115113006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241794 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/focus_cycler_unittest.cc')
| -rw-r--r-- | ash/focus_cycler_unittest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ash/focus_cycler_unittest.cc b/ash/focus_cycler_unittest.cc index ed5340e..3bdc451 100644 --- a/ash/focus_cycler_unittest.cc +++ b/ash/focus_cycler_unittest.cc @@ -4,17 +4,17 @@ #include "ash/focus_cycler.h" -#include "ash/launcher/launcher.h" #include "ash/root_window_controller.h" +#include "ash/shelf/shelf.h" #include "ash/shelf/shelf_widget.h" #include "ash/shell.h" +#include "ash/shell_factory.h" #include "ash/shell_window_ids.h" #include "ash/system/status_area_widget.h" #include "ash/system/status_area_widget_delegate.h" #include "ash/system/tray/system_tray.h" -#include "ash/wm/window_util.h" #include "ash/test/ash_test_base.h" -#include "ash/shell_factory.h" +#include "ash/wm/window_util.h" #include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_windows.h" @@ -74,7 +74,7 @@ class FocusCyclerTest : public AshTestBase { focus_cycler_.reset(new FocusCycler()); - ASSERT_TRUE(Launcher::ForPrimaryDisplay()); + ASSERT_TRUE(Shelf::ForPrimaryDisplay()); } virtual void TearDown() OVERRIDE { @@ -116,7 +116,7 @@ class FocusCyclerTest : public AshTestBase { SystemTray* tray() { return tray_.get(); } ShelfWidget* shelf_widget() { - return Launcher::ForPrimaryDisplay()->shelf_widget(); + return Shelf::ForPrimaryDisplay()->shelf_widget(); } void InstallFocusCycleOnShelf() { |