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

Side by Side Diff: ash/accelerators/accelerator_delegate.cc

Issue 2125883003: Adds ability for pre-target accelerators to not consume events (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge 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
« no previous file with comments | « no previous file | ash/mus/window_manager.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/accelerators/accelerator_delegate.h" 5 #include "ash/accelerators/accelerator_delegate.h"
6 6
7 #include "ash/accelerators/accelerator_controller.h" 7 #include "ash/accelerators/accelerator_controller.h"
8 #include "ash/common/wm/window_state.h" 8 #include "ash/common/wm/window_state.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/wm/window_state_aura.h" 10 #include "ash/wm/window_state_aura.h"
11 #include "ui/base/accelerators/accelerator.h" 11 #include "ui/base/accelerators/accelerator.h"
12 #include "ui/events/event.h" 12 #include "ui/events/event.h"
13 #include "ui/wm/core/window_util.h" 13 #include "ui/wm/core/window_util.h"
14 14
15 namespace ash { 15 namespace ash {
16 namespace {} // namespace
17 16
18 AcceleratorDelegate::AcceleratorDelegate() {} 17 AcceleratorDelegate::AcceleratorDelegate() {}
19 AcceleratorDelegate::~AcceleratorDelegate() {} 18 AcceleratorDelegate::~AcceleratorDelegate() {}
20 19
21 bool AcceleratorDelegate::ProcessAccelerator(const ui::KeyEvent& key_event, 20 bool AcceleratorDelegate::ProcessAccelerator(const ui::KeyEvent& key_event,
22 const ui::Accelerator& accelerator, 21 const ui::Accelerator& accelerator,
23 KeyType key_type) { 22 KeyType key_type) {
24 // Special hardware keys like brightness and volume are handled in 23 // Special hardware keys like brightness and volume are handled in
25 // special way. However, some windows can override this behavior 24 // special way. However, some windows can override this behavior
26 // (e.g. Chrome v1 apps by default and Chrome v2 apps with 25 // (e.g. Chrome v1 apps by default and Chrome v2 apps with
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 80
82 // Handle preferred accelerators (such as ALT-TAB) before sending 81 // Handle preferred accelerators (such as ALT-TAB) before sending
83 // to the target. 82 // to the target.
84 if (shell->accelerator_controller()->IsPreferred(accelerator)) 83 if (shell->accelerator_controller()->IsPreferred(accelerator))
85 return true; 84 return true;
86 85
87 return shell->GetAppListTargetVisibility(); 86 return shell->GetAppListTargetVisibility();
88 } 87 }
89 88
90 } // namespace ash 89 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/mus/window_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698