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

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

Issue 1540753002: Switch to standard integer types in ash/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: arraysize Created 5 years 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
« no previous file with comments | « ash/accelerators/accelerator_commands.cc ('k') | ash/accelerators/accelerator_table.h » ('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_CONTROLLER_H_ 5 #ifndef ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
6 #define ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_ 6 #define ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
7 7
8 #include <stddef.h>
9
8 #include <map> 10 #include <map>
9 #include <set> 11 #include <set>
10 12
11 #include "ash/accelerators/accelerator_table.h" 13 #include "ash/accelerators/accelerator_table.h"
12 #include "ash/accelerators/exit_warning_handler.h" 14 #include "ash/accelerators/exit_warning_handler.h"
13 #include "ash/ash_export.h" 15 #include "ash/ash_export.h"
14 #include "base/basictypes.h"
15 #include "base/compiler_specific.h" 16 #include "base/compiler_specific.h"
16 #include "base/gtest_prod_util.h" 17 #include "base/gtest_prod_util.h"
18 #include "base/macros.h"
17 #include "base/memory/scoped_ptr.h" 19 #include "base/memory/scoped_ptr.h"
18 #include "ui/base/accelerators/accelerator.h" 20 #include "ui/base/accelerators/accelerator.h"
19 #include "ui/base/accelerators/accelerator_history.h" 21 #include "ui/base/accelerators/accelerator_history.h"
20 22
21 namespace ui { 23 namespace ui {
22 class AcceleratorManager; 24 class AcceleratorManager;
23 } 25 }
24 26
25 namespace ash { 27 namespace ash {
26 28
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 std::set<int> actions_needing_window_; 213 std::set<int> actions_needing_window_;
212 // Actions that can be performed without closing the menu (if one is present). 214 // Actions that can be performed without closing the menu (if one is present).
213 std::set<int> actions_keeping_menu_open_; 215 std::set<int> actions_keeping_menu_open_;
214 216
215 DISALLOW_COPY_AND_ASSIGN(AcceleratorController); 217 DISALLOW_COPY_AND_ASSIGN(AcceleratorController);
216 }; 218 };
217 219
218 } // namespace ash 220 } // namespace ash
219 221
220 #endif // ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_ 222 #endif // ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_commands.cc ('k') | ash/accelerators/accelerator_table.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698