Wires up registering accelerators from mash with the wm

ash/common/accelerators/ash_focus_manager_factory.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_ACCELERATORS_FOCUS_MANAGER_FACTORY_H_
-#define ASH_ACCELERATORS_FOCUS_MANAGER_FACTORY_H_
+#ifndef ASH_COMMON_ACCELERATORS_ASH_FOCUS_MANAGER_FACTORY_H_
+#define ASH_COMMON_ACCELERATORS_ASH_FOCUS_MANAGER_FACTORY_H_
 
-#include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "ui/views/focus/focus_manager_delegate.h"
 #include "ui/views/focus/focus_manager_factory.h"
 
 namespace ash {
 
 // A factory class for creating a custom views::FocusManager object which
 // supports Ash shortcuts.
 class AshFocusManagerFactory : public views::FocusManagerFactory {
  public:
@@ skipping 10 matching lines @@
    public:
     // views::FocusManagerDelegate overrides:
     bool ProcessAccelerator(const ui::Accelerator& accelerator) override;
   };
 
   DISALLOW_COPY_AND_ASSIGN(AshFocusManagerFactory);
 };
 
 }  // namespace ash
 
-#endif  // ASH_ACCELERATORS_FOCUS_MANAGER_FACTORY_H_
+#endif  // ASH_COMMON_ACCELERATORS_ASH_FOCUS_MANAGER_FACTORY_H_