Revert "chromeos: Move files in //ash/common to //ash, part 2"
Landing this right after the M58 branch will complicate backports. I'm
going to land it right before the M59 branch.
This reverts commit 775aa607056fbeeaa5a87494f6d61ffa75d22f36.
Original description:
Now that mustash can use standard aura windows we don't need the ash/aura
vs. ash/mus vs. ash/common distinction. Eliminate //ash/common. Also move
files in //ash/common/system/chromeos out to //ash/system because ash only
compiles on chromeos these days.
Part 2 moves a subset of //ash/common into //ash. The CQ cannot move
all the files at once, see https://codereview.chromium.org/2734653002/
BUG=690096
TEST=compiles, ash_unittests
[email protected]
Review-Url: https://codereview.chromium.org/2734683002
Cr-Original-Commit-Position: refs/heads/master@{#454791}
Review-Url: https://codereview.chromium.org/2734753002 .
Cr-Commit-Position: refs/heads/master@{#454798}
diff --git a/ash/focus_cycler_unittest.cc b/ash/focus_cycler_unittest.cc
index 5166b718..03b81df 100644
--- a/ash/focus_cycler_unittest.cc
+++ b/ash/focus_cycler_unittest.cc
@@ -6,9 +6,9 @@
#include <memory>
+#include "ash/common/shelf/shelf_widget.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/wm_shell.h"
-#include "ash/shelf/shelf_widget.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/system/status_area_widget.h"
#include "ash/system/status_area_widget_delegate.h"
#include "ash/system/tray/system_tray.h"
