Commit c3903238 authored by oshima@chromium.org's avatar oshima@chromium.org

Remove obsolete code that handles menu key release for chromeos

BUG=140319
TEST=none

Review URL: https://chromiumcodereview.appspot.com/11150035

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162223 0039d316-1c4b-4281-b951-d872f2087c98
parent e160373f
...@@ -30,9 +30,6 @@ FocusManager::FocusManager(Widget* widget, FocusManagerDelegate* delegate) ...@@ -30,9 +30,6 @@ FocusManager::FocusManager(Widget* widget, FocusManagerDelegate* delegate)
focused_view_(NULL), focused_view_(NULL),
accelerator_manager_(new ui::AcceleratorManager), accelerator_manager_(new ui::AcceleratorManager),
focus_change_reason_(kReasonDirectFocusChange), focus_change_reason_(kReasonDirectFocusChange),
#if defined(USE_X11)
should_handle_menu_key_release_(false),
#endif
is_changing_focus_(false) { is_changing_focus_(false) {
DCHECK(widget_); DCHECK(widget_);
stored_focused_view_storage_id_ = stored_focused_view_storage_id_ =
...@@ -45,39 +42,8 @@ FocusManager::~FocusManager() { ...@@ -45,39 +42,8 @@ FocusManager::~FocusManager() {
bool FocusManager::OnKeyEvent(const ui::KeyEvent& event) { bool FocusManager::OnKeyEvent(const ui::KeyEvent& event) {
const int key_code = event.key_code(); const int key_code = event.key_code();
#if defined(USE_X11)
// TODO(ben): beng believes that this should be done in
// RootWindowHosLinux for aura/linux.
// Always reset |should_handle_menu_key_release_| unless we are handling a
// VKEY_MENU key release event. It ensures that VKEY_MENU accelerator can only
// be activated when handling a VKEY_MENU key release event which is preceded
// by an un-handled VKEY_MENU key press event.
if (key_code != ui::VKEY_MENU || event.type() != ui::ET_KEY_RELEASED)
should_handle_menu_key_release_ = false;
if (event.type() == ui::ET_KEY_PRESSED) {
// VKEY_MENU is triggered by key release event.
// FocusManager::OnKeyEvent() returns false when the key has been consumed.
if ((key_code == ui::VKEY_MENU) &&
(event.flags() & ~ui::EF_ALT_DOWN) == 0) {
should_handle_menu_key_release_ = true;
return false;
}
// Pass through to the rest of OnKeyEvent.
} else if (key_code == ui::VKEY_MENU && should_handle_menu_key_release_ &&
(event.flags() & ~ui::EF_ALT_DOWN) == 0) {
// Trigger VKEY_MENU when only this key is pressed and released, and both
// press and release events are not handled by others.
ui::Accelerator accelerator(ui::VKEY_MENU, ui::EF_NONE);
return ProcessAccelerator(accelerator);
} else if (event.type() != ui::ET_KEY_RELEASED) {
return false;
}
#else
if (event.type() != ui::ET_KEY_PRESSED && event.type() != ui::ET_KEY_RELEASED) if (event.type() != ui::ET_KEY_PRESSED && event.type() != ui::ET_KEY_RELEASED)
return false; return false;
#endif
if (shortcut_handling_suspended()) if (shortcut_handling_suspended())
return true; return true;
...@@ -308,10 +274,6 @@ void FocusManager::ClearFocus() { ...@@ -308,10 +274,6 @@ void FocusManager::ClearFocus() {
} }
void FocusManager::StoreFocusedView() { void FocusManager::StoreFocusedView() {
#if defined(USE_X11)
// Forget menu key state when the window lost focus.
should_handle_menu_key_release_ = false;
#endif
ViewStorage* view_storage = ViewStorage::GetInstance(); ViewStorage* view_storage = ViewStorage::GetInstance();
if (!view_storage) { if (!view_storage) {
// This should never happen but bug 981648 seems to indicate it could. // This should never happen but bug 981648 seems to indicate it could.
...@@ -345,9 +307,6 @@ void FocusManager::StoreFocusedView() { ...@@ -345,9 +307,6 @@ void FocusManager::StoreFocusedView() {
} }
void FocusManager::RestoreFocusedView() { void FocusManager::RestoreFocusedView() {
#if defined(USE_X11)
DCHECK(!should_handle_menu_key_release_);
#endif
ViewStorage* view_storage = ViewStorage::GetInstance(); ViewStorage* view_storage = ViewStorage::GetInstance();
if (!view_storage) { if (!view_storage) {
// This should never happen but bug 981648 seems to indicate it could. // This should never happen but bug 981648 seems to indicate it could.
...@@ -444,17 +403,6 @@ bool FocusManager::ProcessAccelerator(const ui::Accelerator& accelerator) { ...@@ -444,17 +403,6 @@ bool FocusManager::ProcessAccelerator(const ui::Accelerator& accelerator) {
return false; return false;
} }
void FocusManager::MaybeResetMenuKeyState(const ui::KeyEvent& key) {
#if defined(USE_X11)
// Always reset |should_handle_menu_key_release_| unless we are handling a
// VKEY_MENU key release event. It ensures that VKEY_MENU accelerator can only
// be activated when handling a VKEY_MENU key release event which is preceded
// by an unhandled VKEY_MENU key press event. See also HandleKeyboardEvent().
if (key.key_code() != ui::VKEY_MENU || key.type() != ui::ET_KEY_RELEASED)
should_handle_menu_key_release_ = false;
#endif
}
ui::AcceleratorTarget* FocusManager::GetCurrentTargetForAccelerator( ui::AcceleratorTarget* FocusManager::GetCurrentTargetForAccelerator(
const ui::Accelerator& accelerator) const { const ui::Accelerator& accelerator) const {
ui::AcceleratorTarget* target = ui::AcceleratorTarget* target =
......
...@@ -300,11 +300,6 @@ class VIEWS_EXPORT FocusManager { ...@@ -300,11 +300,6 @@ class VIEWS_EXPORT FocusManager {
// The list of registered FocusChange listeners. // The list of registered FocusChange listeners.
ObserverList<FocusChangeListener, true> focus_change_listeners_; ObserverList<FocusChangeListener, true> focus_change_listeners_;
#if defined(USE_X11)
// Indicates if we should handle the upcoming Alt key release event.
bool should_handle_menu_key_release_;
#endif
// See description above getter. // See description above getter.
bool is_changing_focus_; bool is_changing_focus_;
......
...@@ -809,8 +809,6 @@ void DesktopRootWindowHostLinux::DispatchKeyEventPostIME( ...@@ -809,8 +809,6 @@ void DesktopRootWindowHostLinux::DispatchKeyEventPostIME(
const ui::KeyEvent& key) { const ui::KeyEvent& key) {
FocusManager* focus_manager = FocusManager* focus_manager =
native_widget_delegate_->AsWidget()->GetFocusManager(); native_widget_delegate_->AsWidget()->GetFocusManager();
if (focus_manager)
focus_manager->MaybeResetMenuKeyState(key);
if (native_widget_delegate_->OnKeyEvent(key) || !focus_manager) if (native_widget_delegate_->OnKeyEvent(key) || !focus_manager)
return; return;
focus_manager->OnKeyEvent(key); focus_manager->OnKeyEvent(key);
......
...@@ -635,8 +635,6 @@ void NativeWidgetAura::SetVisibilityChangedAnimationsEnabled(bool value) { ...@@ -635,8 +635,6 @@ void NativeWidgetAura::SetVisibilityChangedAnimationsEnabled(bool value) {
void NativeWidgetAura::DispatchKeyEventPostIME(const ui::KeyEvent& key) { void NativeWidgetAura::DispatchKeyEventPostIME(const ui::KeyEvent& key) {
FocusManager* focus_manager = GetWidget()->GetFocusManager(); FocusManager* focus_manager = GetWidget()->GetFocusManager();
if (focus_manager)
focus_manager->MaybeResetMenuKeyState(key);
if (delegate_->OnKeyEvent(key) || !focus_manager) if (delegate_->OnKeyEvent(key) || !focus_manager)
return; return;
focus_manager->OnKeyEvent(key); focus_manager->OnKeyEvent(key);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment