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

ash/common/system/chromeos/palette/palette_tray.h

Index: ash/common/system/chromeos/palette/palette_tray.h
diff --git a/ash/system/palette/palette_tray.h b/ash/common/system/chromeos/palette/palette_tray.h
similarity index 93%
rename from ash/system/palette/palette_tray.h
rename to ash/common/system/chromeos/palette/palette_tray.h
index f3b22fbc595a386351a78180ef0ec520acc450ff..b18c329fe0da4b4a951646cd5055785f2c1e1203 100644
--- a/ash/system/palette/palette_tray.h
+++ b/ash/common/system/chromeos/palette/palette_tray.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_SYSTEM_PALETTE_PALETTE_TRAY_H_
-#define ASH_SYSTEM_PALETTE_PALETTE_TRAY_H_
+#ifndef ASH_COMMON_SYSTEM_CHROMEOS_PALETTE_PALETTE_BUTTON_TRAY_H_
+#define ASH_COMMON_SYSTEM_CHROMEOS_PALETTE_PALETTE_BUTTON_TRAY_H_
 
 #include <map>
 #include <memory>
@@ -12,8 +12,8 @@
 #include "ash/common/palette_delegate.h"
 #include "ash/common/session/session_state_observer.h"
 #include "ash/common/shell_observer.h"
-#include "ash/system/palette/palette_tool_manager.h"
-#include "ash/system/tray/tray_background_view.h"
+#include "ash/common/system/chromeos/palette/palette_tool_manager.h"
+#include "ash/common/system/tray/tray_background_view.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "ui/events/devices/input_device_event_observer.h"
@@ -141,4 +141,4 @@ class ASH_EXPORT PaletteTray : public TrayBackgroundView,
 
 }  // namespace ash
 
-#endif  // ASH_SYSTEM_PALETTE_PALETTE_TRAY_H_
+#endif  // ASH_COMMON_SYSTEM_CHROMEOS_PALETTE_PALETTE_BUTTON_TRAY_H_