Folds WmRootWindowController into RootWindowController

ash/common/accelerators/accelerator_table.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_TABLE_H_
 #define ASH_COMMON_ACCELERATORS_ACCELERATOR_TABLE_H_
 
 #include <stddef.h>
 
 #include "ash/ash_export.h"
@@ skipping 131 matching lines @@
   TOGGLE_HIGH_CONTRAST,
   TOGGLE_MIRROR_MODE,
   TOGGLE_SPOKEN_FEEDBACK,
   TOGGLE_WIFI,
   TOUCH_HUD_CLEAR,
   TOUCH_HUD_MODE_CHANGE,
   TOUCH_HUD_PROJECTION_TOGGLE,
   VOLUME_DOWN,
   VOLUME_MUTE,
   VOLUME_UP,
-#else
-  DUMMY_FOR_RESERVED,
 #endif
 };
 
 struct AcceleratorData {
   bool trigger_on_press;
   ui::KeyboardCode keycode;
   int modifiers;
   AcceleratorAction action;
 };
 
@@ skipping 97 matching lines @@
 ASH_EXPORT extern const AcceleratorAction kActionsNeedingWindow[];
 ASH_EXPORT extern const size_t kActionsNeedingWindowLength;
 
 // Actions that can be performed while keeping the menu open.
 ASH_EXPORT extern const AcceleratorAction kActionsKeepingMenuOpen[];
 ASH_EXPORT extern const size_t kActionsKeepingMenuOpenLength;
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_ACCELERATORS_ACCELERATOR_TABLE_H_