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

Unified Diff: ash/accelerators/focus_manager_factory.cc

Issue 2187703003: Wires up registering accelerators from mash with the wm (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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/accelerators/focus_manager_factory.h ('k') | ash/ash.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/accelerators/focus_manager_factory.cc
diff --git a/ash/accelerators/focus_manager_factory.cc b/ash/accelerators/focus_manager_factory.cc
deleted file mode 100644
index 96fb3d49eb9ed9506a920a09226767e156816776..0000000000000000000000000000000000000000
--- a/ash/accelerators/focus_manager_factory.cc
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ash/accelerators/focus_manager_factory.h"
-
-#include "ash/common/accelerators/accelerator_controller.h"
-#include "ash/common/wm_shell.h"
-#include "ui/views/focus/focus_manager.h"
-
-namespace ash {
-
-AshFocusManagerFactory::AshFocusManagerFactory() {}
-AshFocusManagerFactory::~AshFocusManagerFactory() {}
-
-views::FocusManager* AshFocusManagerFactory::CreateFocusManager(
- views::Widget* widget,
- bool desktop_widget) {
- return new views::FocusManager(widget, desktop_widget ? NULL : new Delegate);
-}
-
-bool AshFocusManagerFactory::Delegate::ProcessAccelerator(
- const ui::Accelerator& accelerator) {
- AcceleratorController* controller = WmShell::Get()->accelerator_controller();
- if (controller)
- return controller->Process(accelerator);
- return false;
-}
-
-} // namespace ash
« no previous file with comments | « ash/accelerators/focus_manager_factory.h ('k') | ash/ash.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698