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
[email protected],[email protected]
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
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 @@
focus_cycler_.reset(new FocusCycler());
- ASSERT_TRUE(Launcher::ForPrimaryDisplay());
+ ASSERT_TRUE(Shelf::ForPrimaryDisplay());
}
virtual void TearDown() OVERRIDE {
@@ -116,7 +116,7 @@
SystemTray* tray() { return tray_.get(); }
ShelfWidget* shelf_widget() {
- return Launcher::ForPrimaryDisplay()->shelf_widget();
+ return Shelf::ForPrimaryDisplay()->shelf_widget();
}
void InstallFocusCycleOnShelf() {
