screenshot disabling policy tests

ash/accelerators/accelerator_action.h

Index: ash/accelerators/accelerator_action.h
diff --git a/ash/accelerators/accelerator_table.h b/ash/accelerators/accelerator_action.h
similarity index 51%
copy from ash/accelerators/accelerator_table.h
copy to ash/accelerators/accelerator_action.h
index 29b85167b38fdc36a1f43fcbf563efd2985aa30d..7e5a24a146cd13bbff87a8770f70ab103577fe31 100644
--- a/ash/accelerators/accelerator_table.h
+++ b/ash/accelerators/accelerator_action.h
@@ -2,11 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_ACCELERATORS_ACCELERATOR_TABLE_H_
-#define ASH_ACCELERATORS_ACCELERATOR_TABLE_H_
-
-#include "ash/ash_export.h"
-#include "ui/aura/event.h"
+#ifndef ASH_ACCELERATORS_ACTION_TABLE_H_

[sky, 2012/08/02 20:14:39]

Should match file name.

[qfel, 2012/08/07 09:23:15]

Done.

+#define ASH_ACCELERATORS_ACTION_TABLE_H_
 
 namespace ash {
 
@@ -69,60 +66,16 @@ enum AcceleratorAction {
   WINDOW_POSITION_CENTER,
   WINDOW_SNAP_LEFT,
   WINDOW_SNAP_RIGHT,
-#if defined(OS_CHROMEOS)
   CYCLE_DISPLAY_MODE,
   LOCK_SCREEN,
   OPEN_CROSH,
   OPEN_FILE_MANAGER_DIALOG,
   OPEN_FILE_MANAGER_TAB,
-#endif
-#if !defined(NDEBUG)
   PRINT_LAYER_HIERARCHY,
   PRINT_VIEW_HIERARCHY,
   PRINT_WINDOW_HIERARCHY,
-#endif
-};
-
-struct AcceleratorData {
-  bool trigger_on_press;
-  ui::KeyboardCode keycode;
-  int modifiers;
-  AcceleratorAction action;
 };
 
-// Accelerators handled by AcceleratorController.
-ASH_EXPORT extern const AcceleratorData kAcceleratorData[];
-
-// The number of elements in kAcceleratorData.
-ASH_EXPORT extern const size_t kAcceleratorDataLength;
-
-// Debug accelerators enabled only when "Debugging keyboard shortcuts" flag
-// (--ash-debug-shortcuts) is enabled.
-ASH_EXPORT extern const AcceleratorData kDebugAcceleratorData[];
-
-// The number of elements in kDebugAcceleratorData.
-ASH_EXPORT extern const size_t kDebugAcceleratorDataLength;
-
-// Actions that should be handled very early in Ash unless the current target
-// window is full-screen.
-ASH_EXPORT extern const AcceleratorAction kReservedActions[];
-
-// The number of elements in kReservedActions.
-ASH_EXPORT extern const size_t kReservedActionsLength;
-
-// Actions allowed while user is not signed in or screen is locked.
-ASH_EXPORT extern const AcceleratorAction kActionsAllowedAtLoginOrLockScreen[];
-
-// The number of elements in kActionsAllowedAtLoginOrLockScreen.
-ASH_EXPORT extern const size_t kActionsAllowedAtLoginOrLockScreenLength;
-
-// Actions allowed while screen is locked (in addition to
-// kActionsAllowedAtLoginOrLockScreen).
-ASH_EXPORT extern const AcceleratorAction kActionsAllowedAtLockScreen[];
-
-// The number of elements in kActionsAllowedAtLockScreen.
-ASH_EXPORT extern const size_t kActionsAllowedAtLockScreenLength;
-
 }  // namespace ash
 
 #endif  // ASH_ACCELERATORS_ACCELERATOR_TABLE_H_