Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(123)

Side by Side Diff: ash/accelerators/accelerator_table.h

Issue 10675011: Rename the remaining usage of Monitor to Display (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/accelerators/accelerator_controller.cc ('k') | ash/accelerators/accelerator_table.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_ACCELERATORS_ACCELERATOR_TABLE_H_ 5 #ifndef ASH_ACCELERATORS_ACCELERATOR_TABLE_H_
6 #define ASH_ACCELERATORS_ACCELERATOR_TABLE_H_ 6 #define ASH_ACCELERATORS_ACCELERATOR_TABLE_H_
7 #pragma once 7 #pragma once
8 8
9 #include "ash/ash_export.h" 9 #include "ash/ash_export.h"
10 #include "ui/aura/event.h" 10 #include "ui/aura/event.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 WINDOW_POSITION_CENTER, 60 WINDOW_POSITION_CENTER,
61 WINDOW_SNAP_LEFT, 61 WINDOW_SNAP_LEFT,
62 WINDOW_SNAP_RIGHT, 62 WINDOW_SNAP_RIGHT,
63 #if defined(OS_CHROMEOS) 63 #if defined(OS_CHROMEOS)
64 CYCLE_DISPLAY_MODE, 64 CYCLE_DISPLAY_MODE,
65 LOCK_SCREEN, 65 LOCK_SCREEN,
66 OPEN_CROSH, 66 OPEN_CROSH,
67 OPEN_FILE_MANAGER_DIALOG, 67 OPEN_FILE_MANAGER_DIALOG,
68 OPEN_FILE_MANAGER_TAB, 68 OPEN_FILE_MANAGER_TAB,
69 #endif 69 #endif
70 MONITOR_ADD_REMOVE, 70 DISPLAY_ADD_REMOVE,
71 MONITOR_CYCLE, 71 DISPLAY_CYCLE,
72 MONITOR_TOGGLE_SCALE, 72 DISPLAY_TOGGLE_SCALE,
73 ROTATE_SCREEN, 73 ROTATE_SCREEN,
74 TOGGLE_DESKTOP_BACKGROUND_MODE, 74 TOGGLE_DESKTOP_BACKGROUND_MODE,
75 TOGGLE_ROOT_WINDOW_FULL_SCREEN, 75 TOGGLE_ROOT_WINDOW_FULL_SCREEN,
76 #if !defined(NDEBUG) 76 #if !defined(NDEBUG)
77 PRINT_LAYER_HIERARCHY, 77 PRINT_LAYER_HIERARCHY,
78 PRINT_WINDOW_HIERARCHY, 78 PRINT_WINDOW_HIERARCHY,
79 #endif 79 #endif
80 }; 80 };
81 81
82 struct AcceleratorData { 82 struct AcceleratorData {
(...skipping 25 matching lines...) Expand all
108 // Actions allowed while screen is locked (in addition to 108 // Actions allowed while screen is locked (in addition to
109 // kActionsAllowedAtLoginOrLockScreen). 109 // kActionsAllowedAtLoginOrLockScreen).
110 ASH_EXPORT extern const AcceleratorAction kActionsAllowedAtLockScreen[]; 110 ASH_EXPORT extern const AcceleratorAction kActionsAllowedAtLockScreen[];
111 111
112 // The number of elements in kActionsAllowedAtLockScreen. 112 // The number of elements in kActionsAllowedAtLockScreen.
113 ASH_EXPORT extern const size_t kActionsAllowedAtLockScreenLength; 113 ASH_EXPORT extern const size_t kActionsAllowedAtLockScreenLength;
114 114
115 } // namespace ash 115 } // namespace ash
116 116
117 #endif // ASH_ACCELERATORS_ACCELERATOR_TABLE_H_ 117 #endif // ASH_ACCELERATORS_ACCELERATOR_TABLE_H_
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_controller.cc ('k') | ash/accelerators/accelerator_table.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698