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

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

Issue 1177773002: Deprecating high-conflict accelerators (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Simplified the design, modified tests accordingly, made accelerators consumable by webcontents if n… Created 5 years, 6 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 (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 #ifndef ASH_ACCELERATORS_FOCUS_MANAGER_FACTORY_H_ 5 #ifndef ASH_ACCELERATORS_FOCUS_MANAGER_FACTORY_H_
6 #define ASH_ACCELERATORS_FOCUS_MANAGER_FACTORY_H_ 6 #define ASH_ACCELERATORS_FOCUS_MANAGER_FACTORY_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "ui/views/focus/focus_manager_delegate.h" 10 #include "ui/views/focus/focus_manager_delegate.h"
(...skipping 13 matching lines...) Expand all
24 views::FocusManager* CreateFocusManager(views::Widget* widget, 24 views::FocusManager* CreateFocusManager(views::Widget* widget,
25 bool desktop_widget) override; 25 bool desktop_widget) override;
26 26
27 private: 27 private:
28 class Delegate : public views::FocusManagerDelegate { 28 class Delegate : public views::FocusManagerDelegate {
29 public: 29 public:
30 // views::FocusManagerDelegate overrides: 30 // views::FocusManagerDelegate overrides:
31 bool ProcessAccelerator(const ui::Accelerator& accelerator) override; 31 bool ProcessAccelerator(const ui::Accelerator& accelerator) override;
32 ui::AcceleratorTarget* GetCurrentTargetForAccelerator( 32 ui::AcceleratorTarget* GetCurrentTargetForAccelerator(
33 const ui::Accelerator& accelerator) const override; 33 const ui::Accelerator& accelerator) const override;
34 bool IsAcceleratorDeprecated(
35 const ui::Accelerator& accelerator) const override;
34 }; 36 };
35 37
36 DISALLOW_COPY_AND_ASSIGN(AshFocusManagerFactory); 38 DISALLOW_COPY_AND_ASSIGN(AshFocusManagerFactory);
37 }; 39 };
38 40
39 } // namespace ash 41 } // namespace ash
40 42
41 #endif // ASH_ACCELERATORS_FOCUS_MANAGER_FACTORY_H_ 43 #endif // ASH_ACCELERATORS_FOCUS_MANAGER_FACTORY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698