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

ash/common/system/tray/tray_popup_header_button.h

 // Copyright 2013 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_TRAY_TRAY_POPUP_HEADER_BUTTON_H_
-#define ASH_SYSTEM_TRAY_TRAY_POPUP_HEADER_BUTTON_H_
+#ifndef ASH_COMMON_SYSTEM_TRAY_TRAY_POPUP_HEADER_BUTTON_H_
+#define ASH_COMMON_SYSTEM_TRAY_TRAY_POPUP_HEADER_BUTTON_H_
 
 #include "ash/ash_export.h"
 #include "base/macros.h"
 #include "ui/views/controls/button/image_button.h"
 
 namespace ash {
 
 // A ToggleImageButton with fixed size, paddings and hover effects. These
 // buttons are used in the header.
 class ASH_EXPORT TrayPopupHeaderButton : public views::ToggleImageButton {
@@ skipping 19 matching lines @@
   // Overridden from views::CustomButton:
   void StateChanged(ButtonState old_state) override;
 
   void Initialize(const gfx::ImageSkia& icon, int accessible_name_id);
 
   DISALLOW_COPY_AND_ASSIGN(TrayPopupHeaderButton);
 };
 
 }  // namespace ash
 
-#endif  // ASH_SYSTEM_TRAY_TRAY_POPUP_HEADER_BUTTON_H_
+#endif  // ASH_COMMON_SYSTEM_TRAY_TRAY_POPUP_HEADER_BUTTON_H_