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

Side by Side Diff: ash/mus/accelerators/accelerator_controller_registrar.cc

Issue 2625873007: Promotes WmWindowMus functions to WmWindowAura and nukes WmWindowMus (Closed)
Patch Set: merge Created 3 years, 11 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
« no previous file with comments | « ash/mus/BUILD.gn ('k') | ash/mus/accelerators/accelerator_controller_unittest.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 #include "ash/mus/accelerators/accelerator_controller_registrar.h" 5 #include "ash/mus/accelerators/accelerator_controller_registrar.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "ash/common/accelerators/accelerator_controller.h" 9 #include "ash/common/accelerators/accelerator_controller.h"
10 #include "ash/common/accelerators/accelerator_router.h" 10 #include "ash/common/accelerators/accelerator_router.h"
11 #include "ash/common/wm_shell.h" 11 #include "ash/common/wm_shell.h"
12 #include "ash/mus/accelerators/accelerator_ids.h" 12 #include "ash/mus/accelerators/accelerator_ids.h"
13 #include "ash/mus/bridge/wm_window_mus.h"
14 #include "ash/mus/window_manager.h" 13 #include "ash/mus/window_manager.h"
15 #include "base/logging.h" 14 #include "base/logging.h"
16 #include "services/ui/common/accelerator_util.h" 15 #include "services/ui/common/accelerator_util.h"
17 #include "ui/base/accelerators/accelerator_history.h" 16 #include "ui/base/accelerators/accelerator_history.h"
18 17
19 namespace ash { 18 namespace ash {
20 namespace mus { 19 namespace mus {
21 namespace { 20 namespace {
22 21
23 // Callback from registering the accelerator. 22 // Callback from registering the accelerator.
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 // Common case is we never wrap once, so this is typically cheap. Additionally 164 // Common case is we never wrap once, so this is typically cheap. Additionally
166 // we expect there not to be too many accelerators. 165 // we expect there not to be too many accelerators.
167 while (ids_.count(next_id_) > 0) 166 while (ids_.count(next_id_) > 0)
168 ++next_id_; 167 ++next_id_;
169 ids_.insert(next_id_); 168 ids_.insert(next_id_);
170 return next_id_++; 169 return next_id_++;
171 } 170 }
172 171
173 } // namespace mus 172 } // namespace mus
174 } // namespace ash 173 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/BUILD.gn ('k') | ash/mus/accelerators/accelerator_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698