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

ash/accelerators/accelerator_controller.h

 // Copyright (c) 2012 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_H_
-#define ASH_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
+#ifndef ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
+#define ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
 
 #include <stddef.h>
 
 #include <map>
 #include <memory>
 #include <set>
 #include <vector>
 
+#include "ash/accelerators/accelerator_table.h"
+#include "ash/accelerators/exit_warning_handler.h"
 #include "ash/ash_export.h"
-#include "ash/common/accelerators/accelerator_table.h"
-#include "ash/common/accelerators/exit_warning_handler.h"
 #include "ash/public/interfaces/accelerator_controller.mojom.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/accelerators/accelerator_history.h"
 
 namespace ui {
 class AcceleratorManager;
@@ skipping 196 matching lines @@
   // Actions disallowed if there are no windows.
   std::set<int> actions_needing_window_;
   // Actions that can be performed without closing the menu (if one is present).
   std::set<int> actions_keeping_menu_open_;
 
   DISALLOW_COPY_AND_ASSIGN(AcceleratorController);
 };
 
 }  // namespace ash
 
-#endif  // ASH_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
+#endif  // ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_