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

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

Issue 1890713002: Adds WmWindow and converts WindowState to use it (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge again Created 4 years, 8 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/shell.h" 8 #include "ash/shell.h"
9 #include "ash/wm/window_state.h" 9 #include "ash/wm/window_state.h"
10 #include "ash/wm/window_state_aura.h"
10 #include "ui/base/accelerators/accelerator.h" 11 #include "ui/base/accelerators/accelerator.h"
11 #include "ui/events/event.h" 12 #include "ui/events/event.h"
12 #include "ui/wm/core/window_util.h" 13 #include "ui/wm/core/window_util.h"
13 14
14 namespace ash { 15 namespace ash {
15 namespace {} // namespace 16 namespace {} // namespace
16 17
17 AcceleratorDelegate::AcceleratorDelegate() { 18 AcceleratorDelegate::AcceleratorDelegate() {
18 } 19 }
19 AcceleratorDelegate::~AcceleratorDelegate() { 20 AcceleratorDelegate::~AcceleratorDelegate() {
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 83
83 // Handle preferred accelerators (such as ALT-TAB) before sending 84 // Handle preferred accelerators (such as ALT-TAB) before sending
84 // to the target. 85 // to the target.
85 if (shell->accelerator_controller()->IsPreferred(accelerator)) 86 if (shell->accelerator_controller()->IsPreferred(accelerator))
86 return true; 87 return true;
87 88
88 return shell->GetAppListTargetVisibility(); 89 return shell->GetAppListTargetVisibility();
89 } 90 }
90 91
91 } // namespace ash 92 } // 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