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

ash/common/system/tray/system_tray.h

Index: ash/common/system/tray/system_tray.h
diff --git a/ash/system/tray/system_tray.h b/ash/common/system/tray/system_tray.h
similarity index 97%
rename from ash/system/tray/system_tray.h
rename to ash/common/system/tray/system_tray.h
index 3997ba047718905b192ebef9f746e89ede7ce39a..38af857b444b9030eac38370e35cd5dbd4da5bc7 100644
--- a/ash/system/tray/system_tray.h
+++ b/ash/common/system/tray/system_tray.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
-#define ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
+#ifndef ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_H_
+#define ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_H_
 
 #include <map>
 #include <memory>
 #include <vector>
 
 #include "ash/ash_export.h"
-#include "ash/system/tray/system_tray_bubble.h"
-#include "ash/system/tray/tray_background_view.h"
+#include "ash/common/system/tray/system_tray_bubble.h"
+#include "ash/common/system/tray/tray_background_view.h"
 #include "base/macros.h"
 #include "ui/views/bubble/tray_bubble_view.h"
 #include "ui/views/view.h"
@@ -253,4 +253,4 @@ class ASH_EXPORT SystemTray : public TrayBackgroundView,
 
 }  // namespace ash
 
-#endif  // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
+#endif  // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_H_