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

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

Issue 2170753005: Moves AcceleratorController from Shell to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: include 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 | « ash/accelerators/accelerator_delegate.cc ('k') | ash/common/wm_shell.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 (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 #include "ash/accelerators/focus_manager_factory.h" 5 #include "ash/accelerators/focus_manager_factory.h"
6 6
7 #include "ash/common/accelerators/accelerator_controller.h" 7 #include "ash/common/accelerators/accelerator_controller.h"
8 #include "ash/shell.h" 8 #include "ash/common/wm_shell.h"
9 #include "ui/views/focus/focus_manager.h" 9 #include "ui/views/focus/focus_manager.h"
10 10
11 namespace ash { 11 namespace ash {
12 12
13 AshFocusManagerFactory::AshFocusManagerFactory() {} 13 AshFocusManagerFactory::AshFocusManagerFactory() {}
14 AshFocusManagerFactory::~AshFocusManagerFactory() {} 14 AshFocusManagerFactory::~AshFocusManagerFactory() {}
15 15
16 views::FocusManager* AshFocusManagerFactory::CreateFocusManager( 16 views::FocusManager* AshFocusManagerFactory::CreateFocusManager(
17 views::Widget* widget, 17 views::Widget* widget,
18 bool desktop_widget) { 18 bool desktop_widget) {
19 return new views::FocusManager(widget, desktop_widget ? NULL : new Delegate); 19 return new views::FocusManager(widget, desktop_widget ? NULL : new Delegate);
20 } 20 }
21 21
22 bool AshFocusManagerFactory::Delegate::ProcessAccelerator( 22 bool AshFocusManagerFactory::Delegate::ProcessAccelerator(
23 const ui::Accelerator& accelerator) { 23 const ui::Accelerator& accelerator) {
24 AcceleratorController* controller = 24 AcceleratorController* controller = WmShell::Get()->accelerator_controller();
25 Shell::GetInstance()->accelerator_controller();
26 if (controller) 25 if (controller)
27 return controller->Process(accelerator); 26 return controller->Process(accelerator);
28 return false; 27 return false;
29 } 28 }
30 29
31 } // namespace ash 30 } // namespace ash
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_delegate.cc ('k') | ash/common/wm_shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698