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

Unified Diff: ui/views/focus/focus_manager.h

Issue 10134036: Let Chrome app handle Ash accelerators first if the app is launched as a window (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: final rebase Created 8 years, 7 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 | « chrome/browser/ui/views/frame/browser_view.cc ('k') | ui/views/focus/focus_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/focus/focus_manager.h
diff --git a/ui/views/focus/focus_manager.h b/ui/views/focus/focus_manager.h
index d8c60a68c189dd5f86798bf978a230890f359394..cf6cb86798f80d19eaf6bbfba5f09504ec3dc1c7 100644
--- a/ui/views/focus/focus_manager.h
+++ b/ui/views/focus/focus_manager.h
@@ -80,6 +80,7 @@ class AcceleratorManager;
namespace views {
+class FocusManagerDelegate;
class FocusSearch;
class RootView;
class View;
@@ -136,7 +137,7 @@ class VIEWS_EXPORT FocusManager {
kReasonDirectFocusChange
};
- explicit FocusManager(Widget* widget);
+ FocusManager(Widget* widget, FocusManagerDelegate* delegate);
virtual ~FocusManager();
// Processes the passed key event for accelerators and tab traversal.
@@ -270,6 +271,10 @@ class VIEWS_EXPORT FocusManager {
// The top-level Widget this FocusManager is associated with.
Widget* widget_;
+ // The object which handles an accelerator when |accelerator_manager_| doesn't
+ // handle it.
+ scoped_ptr<FocusManagerDelegate> delegate_;
+
// The view that currently is focused.
View* focused_view_;
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.cc ('k') | ui/views/focus/focus_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698