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

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

Issue 838253004: MacViews: Fix duplicate definition of ExtensionKeyBindingRegistry::SetShortcutHandlingSuspended (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@DragBookmarks2
Patch Set: Fix Mac Created 5 years, 11 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/webui/extensions/command_handler.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 3ba730d55e337f07b78a6708da9cfddfb6c99a3b..c3e953f7387ecff876ffa4374c70a7552bdeaa0a 100644
--- a/ui/views/focus/focus_manager.h
+++ b/ui/views/focus/focus_manager.h
@@ -226,7 +226,7 @@ class VIEWS_EXPORT FocusManager {
void BlurTextInputClient(View* view);
// Disable shortcut handling.
- static void set_shortcut_handling_suspended(bool suspended) {
+ void set_shortcut_handling_suspended(bool suspended) {
shortcut_handling_suspended_ = suspended;
}
// Returns whether shortcut handling is currently suspended.
@@ -344,9 +344,6 @@ class VIEWS_EXPORT FocusManager {
// and should not be processed further.
bool ProcessArrowKeyTraversal(const ui::KeyEvent& event);
- // Keeps track of whether shortcut handling is currently suspended.
- static bool shortcut_handling_suspended_;
-
// Whether arrow key traversal is enabled.
static bool arrow_key_traversal_enabled_;
@@ -363,6 +360,9 @@ class VIEWS_EXPORT FocusManager {
// The AcceleratorManager this FocusManager is associated with.
scoped_ptr<ui::AcceleratorManager> accelerator_manager_;
+ // Keeps track of whether shortcut handling is currently suspended.
+ bool shortcut_handling_suspended_;
+
// The storage id used in the ViewStorage to store/restore the view that last
// had focus.
int stored_focused_view_storage_id_;
« no previous file with comments | « chrome/browser/ui/webui/extensions/command_handler.cc ('k') | ui/views/focus/focus_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698