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

Unified Diff: views/focus/focus_manager.h

Issue 8508055: Move views::Accelerator to ui in order to use it from aura code. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 9 years, 1 month 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
Index: views/focus/focus_manager.h
diff --git a/views/focus/focus_manager.h b/views/focus/focus_manager.h
index 484e441efd56782433635ca7cae510b97ae7747c..ce1b69e3ef8489d8f3472e599af96cf0ed6c1f23 100644
--- a/views/focus/focus_manager.h
+++ b/views/focus/focus_manager.h
@@ -185,14 +185,14 @@ class VIEWS_EXPORT FocusManager {
// - any F key (F1, F2, F3 ...)
// - any browser specific keys (as available on special keyboards)
void RegisterAccelerator(const Accelerator& accelerator,
- AcceleratorTarget* target);
+ ui::AcceleratorTarget* target);
// Unregister the specified keyboard accelerator for the specified target.
void UnregisterAccelerator(const Accelerator& accelerator,
- AcceleratorTarget* target);
+ ui::AcceleratorTarget* target);
// Unregister all keyboard accelerator for the specified target.
- void UnregisterAccelerators(AcceleratorTarget* target);
+ void UnregisterAccelerators(ui::AcceleratorTarget* target);
// Activate the target associated with the specified accelerator.
// First, AcceleratorPressed handler of the most recently registered target
@@ -216,7 +216,7 @@ class VIEWS_EXPORT FocusManager {
// Returns the AcceleratorTarget that should be activated for the specified
// keyboard accelerator, or NULL if no view is registered for that keyboard
// accelerator.
- AcceleratorTarget* GetCurrentTargetForAccelerator(
+ ui::AcceleratorTarget* GetCurrentTargetForAccelerator(
const Accelerator& accelertor) const;
// Sets the focus to the specified native view.
@@ -256,7 +256,7 @@ class VIEWS_EXPORT FocusManager {
FocusChangeReason focus_change_reason_;
// The accelerators and associated targets.
- typedef std::list<AcceleratorTarget*> AcceleratorTargetList;
+ typedef std::list<ui::AcceleratorTarget*> AcceleratorTargetList;
typedef std::map<Accelerator, AcceleratorTargetList> AcceleratorMap;
AcceleratorMap accelerators_;

Powered by Google App Engine
This is Rietveld 408576698