chromeos: Move files in //ash/common to //ash, part 2

ash/accelerators/accelerator_controller_delegate.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_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_
-#define ASH_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_
+#ifndef ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_
+#define ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_
 
+#include "ash/accelerators/accelerator_table.h"
 #include "ash/ash_export.h"
-#include "ash/common/accelerators/accelerator_table.h"
 
 namespace ui {
 class Accelerator;
 }
 
 namespace ash {
 
 // Used by AcceleratorController to handle environment specific commands. This
 // file is temporary while ash supports both mus and aura.
 class ASH_EXPORT AcceleratorControllerDelegate {
@@ skipping 20 matching lines @@
       int message_id,
       int old_shortcut_id,
       int new_shortcut_id) = 0;
 
  protected:
   virtual ~AcceleratorControllerDelegate() {}
 };
 
 }  // namespace ash
 
-#endif  // ASH_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_
+#endif  // ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_