Revert "chromeos: Move files in //ash/common to //ash, part 1"

ash/common/system/tray/system_tray.cc

Index: ash/common/system/tray/system_tray.cc
diff --git a/ash/system/tray/system_tray.cc b/ash/common/system/tray/system_tray.cc
similarity index 93%
rename from ash/system/tray/system_tray.cc
rename to ash/common/system/tray/system_tray.cc
index fd6d1068d60fd23661b38afc4913926733e88aca..521e2057e473528c942b6ef3cc186650a7de8f17 100644
--- a/ash/system/tray/system_tray.cc
+++ b/ash/common/system/tray/system_tray.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/system/tray/system_tray.h"
+#include "ash/common/system/tray/system_tray.h"
 
 #include <algorithm>
 #include <map>
@@ -14,6 +14,36 @@
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shelf/wm_shelf_util.h"
+#include "ash/common/system/chromeos/audio/tray_audio.h"
+#include "ash/common/system/chromeos/bluetooth/tray_bluetooth.h"
+#include "ash/common/system/chromeos/brightness/tray_brightness.h"
+#include "ash/common/system/chromeos/cast/tray_cast.h"
+#include "ash/common/system/chromeos/enterprise/tray_enterprise.h"
+#include "ash/common/system/chromeos/media_security/multi_profile_media_tray_item.h"
+#include "ash/common/system/chromeos/network/tray_network.h"
+#include "ash/common/system/chromeos/network/tray_vpn.h"
+#include "ash/common/system/chromeos/power/power_status.h"
+#include "ash/common/system/chromeos/power/tray_power.h"
+#include "ash/common/system/chromeos/screen_security/screen_capture_tray_item.h"
+#include "ash/common/system/chromeos/screen_security/screen_share_tray_item.h"
+#include "ash/common/system/chromeos/session/tray_session_length_limit.h"
+#include "ash/common/system/chromeos/settings/tray_settings.h"
+#include "ash/common/system/chromeos/supervised/tray_supervised_user.h"
+#include "ash/common/system/chromeos/tray_caps_lock.h"
+#include "ash/common/system/chromeos/tray_tracing.h"
+#include "ash/common/system/date/tray_date.h"
+#include "ash/common/system/date/tray_system_info.h"
+#include "ash/common/system/ime/tray_ime_chromeos.h"
+#include "ash/common/system/tiles/tray_tiles.h"
+#include "ash/common/system/tray/system_tray_controller.h"
+#include "ash/common/system/tray/system_tray_delegate.h"
+#include "ash/common/system/tray/system_tray_item.h"
+#include "ash/common/system/tray/tray_bubble_wrapper.h"
+#include "ash/common/system/tray/tray_constants.h"
+#include "ash/common/system/tray_accessibility.h"
+#include "ash/common/system/update/tray_update.h"
+#include "ash/common/system/user/tray_user.h"
+#include "ash/common/system/web_notification/web_notification_tray.h"
 #include "ash/common/wm/container_finder.h"
 #include "ash/common/wm_activation_observer.h"
 #include "ash/common/wm_shell.h"
@@ -21,36 +51,6 @@
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "ash/strings/grit/ash_strings.h"
-#include "ash/system/audio/tray_audio.h"
-#include "ash/system/bluetooth/tray_bluetooth.h"
-#include "ash/system/brightness/tray_brightness.h"
-#include "ash/system/cast/tray_cast.h"
-#include "ash/system/date/tray_date.h"
-#include "ash/system/date/tray_system_info.h"
-#include "ash/system/enterprise/tray_enterprise.h"
-#include "ash/system/ime/tray_ime_chromeos.h"
-#include "ash/system/media_security/multi_profile_media_tray_item.h"
-#include "ash/system/network/tray_network.h"
-#include "ash/system/network/tray_vpn.h"
-#include "ash/system/power/power_status.h"
-#include "ash/system/power/tray_power.h"
-#include "ash/system/screen_security/screen_capture_tray_item.h"
-#include "ash/system/screen_security/screen_share_tray_item.h"
-#include "ash/system/session/tray_session_length_limit.h"
-#include "ash/system/settings/tray_settings.h"
-#include "ash/system/supervised/tray_supervised_user.h"
-#include "ash/system/tiles/tray_tiles.h"
-#include "ash/system/tray/system_tray_controller.h"
-#include "ash/system/tray/system_tray_delegate.h"
-#include "ash/system/tray/system_tray_item.h"
-#include "ash/system/tray/tray_bubble_wrapper.h"
-#include "ash/system/tray/tray_constants.h"
-#include "ash/system/tray_accessibility.h"
-#include "ash/system/tray_caps_lock.h"
-#include "ash/system/tray_tracing.h"
-#include "ash/system/update/tray_update.h"
-#include "ash/system/user/tray_user.h"
-#include "ash/system/web_notification/web_notification_tray.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"