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

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

Issue 2095193002: clang-format all of //ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 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 16 namespace {} // namespace
17 17
18 AcceleratorDelegate::AcceleratorDelegate() { 18 AcceleratorDelegate::AcceleratorDelegate() {}
19 } 19 AcceleratorDelegate::~AcceleratorDelegate() {}
20 AcceleratorDelegate::~AcceleratorDelegate() {
21 }
22 20
23 bool AcceleratorDelegate::ProcessAccelerator(const ui::KeyEvent& key_event, 21 bool AcceleratorDelegate::ProcessAccelerator(const ui::KeyEvent& key_event,
24 const ui::Accelerator& accelerator, 22 const ui::Accelerator& accelerator,
25 KeyType key_type) { 23 KeyType key_type) {
26 // Special hardware keys like brightness and volume are handled in 24 // Special hardware keys like brightness and volume are handled in
27 // special way. However, some windows can override this behavior 25 // special way. However, some windows can override this behavior
28 // (e.g. Chrome v1 apps by default and Chrome v2 apps with 26 // (e.g. Chrome v1 apps by default and Chrome v2 apps with
29 // permission) by setting a window property. 27 // permission) by setting a window property.
30 if (key_type == KEY_TYPE_SYSTEM && !CanConsumeSystemKeys(key_event)) { 28 if (key_type == KEY_TYPE_SYSTEM && !CanConsumeSystemKeys(key_event)) {
31 // System keys are always consumed regardless of whether they trigger an 29 // System keys are always consumed regardless of whether they trigger an
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 81
84 // Handle preferred accelerators (such as ALT-TAB) before sending 82 // Handle preferred accelerators (such as ALT-TAB) before sending
85 // to the target. 83 // to the target.
86 if (shell->accelerator_controller()->IsPreferred(accelerator)) 84 if (shell->accelerator_controller()->IsPreferred(accelerator))
87 return true; 85 return true;
88 86
89 return shell->GetAppListTargetVisibility(); 87 return shell->GetAppListTargetVisibility();
90 } 88 }
91 89
92 } // namespace ash 90 } // namespace ash
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_controller_unittest.cc ('k') | ash/accelerators/accelerator_filter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698