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

ash/system/palette/palette_tray.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // 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_
 
 #include <map>
 #include <memory>
 
 #include "ash/ash_export.h"
-#include "ash/palette_delegate.h"
-#include "ash/session/session_state_observer.h"
-#include "ash/shell_observer.h"
+#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 "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "ui/events/devices/input_device_event_observer.h"
 
 namespace gfx {
 class Point;
 }
 
@@ skipping 110 matching lines @@
   int num_actions_in_bubble_ = 0;
 
   base::WeakPtrFactory<PaletteTray> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PaletteTray);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_PALETTE_PALETTE_TRAY_H_