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

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

Issue 2166793005: Moves accelerator code using common types to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@debug_commands
Patch Set: not relative Created 4 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
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_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
6 #define ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_ 6 #define ASH_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <map> 10 #include <map>
11 #include <memory> 11 #include <memory>
12 #include <set> 12 #include <set>
13 13
14 #include "ash/accelerators/accelerator_table.h"
15 #include "ash/accelerators/exit_warning_handler.h"
16 #include "ash/ash_export.h" 14 #include "ash/ash_export.h"
15 #include "ash/common/accelerators/accelerator_table.h"
16 #include "ash/common/accelerators/exit_warning_handler.h"
17 #include "base/compiler_specific.h" 17 #include "base/compiler_specific.h"
18 #include "base/gtest_prod_util.h" 18 #include "base/gtest_prod_util.h"
19 #include "base/macros.h" 19 #include "base/macros.h"
20 #include "ui/base/accelerators/accelerator.h" 20 #include "ui/base/accelerators/accelerator.h"
21 #include "ui/base/accelerators/accelerator_history.h" 21 #include "ui/base/accelerators/accelerator_history.h"
22 22
23 namespace ui { 23 namespace ui {
24 class AcceleratorManager; 24 class AcceleratorManager;
25 } 25 }
26 26
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 // Actions disallowed if there are no windows. 193 // Actions disallowed if there are no windows.
194 std::set<int> actions_needing_window_; 194 std::set<int> actions_needing_window_;
195 // Actions that can be performed without closing the menu (if one is present). 195 // Actions that can be performed without closing the menu (if one is present).
196 std::set<int> actions_keeping_menu_open_; 196 std::set<int> actions_keeping_menu_open_;
197 197
198 DISALLOW_COPY_AND_ASSIGN(AcceleratorController); 198 DISALLOW_COPY_AND_ASSIGN(AcceleratorController);
199 }; 199 };
200 200
201 } // namespace ash 201 } // namespace ash
202 202
203 #endif // ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_ 203 #endif // ASH_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ash/common/accelerators/accelerator_commands.cc ('k') | ash/common/accelerators/accelerator_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698