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

Unified Diff: ui/views/controls/menu/menu_event_dispatcher.cc

Issue 1679923003: Cleanup: Remove MenuEventDispatcher (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 | « ui/views/controls/menu/menu_event_dispatcher.h ('k') | ui/views/views.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/menu/menu_event_dispatcher.cc
diff --git a/ui/views/controls/menu/menu_event_dispatcher.cc b/ui/views/controls/menu/menu_event_dispatcher.cc
deleted file mode 100644
index 9b7c231b939f87ddd57f5ef24271f4b5752eee48..0000000000000000000000000000000000000000
--- a/ui/views/controls/menu/menu_event_dispatcher.cc
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ui/views/controls/menu/menu_event_dispatcher.h"
-
-#include "base/memory/scoped_ptr.h"
-#include "ui/aura/window.h"
-#include "ui/events/event_utils.h"
-#include "ui/events/keycodes/keyboard_code_conversion.h"
-#include "ui/events/keycodes/keyboard_codes.h"
-#include "ui/views/controls/menu/menu_controller.h"
-#include "ui/views/widget/widget.h"
-
-namespace views {
-namespace internal {
-
-MenuEventDispatcher::MenuEventDispatcher(MenuController* controller)
- : menu_controller_(controller) {}
-
-MenuEventDispatcher::~MenuEventDispatcher() {}
-
-bool MenuEventDispatcher::CanDispatchEvent(const ui::PlatformEvent& event) {
- return true;
-}
-
-uint32_t MenuEventDispatcher::DispatchEvent(const ui::PlatformEvent& event) {
- bool should_perform_default = true;
- bool should_process_event = true;
-
- // Check if the event should be handled.
- scoped_ptr<ui::Event> ui_event(ui::EventFromNative(event));
- if (ui_event && menu_controller_->owner()) {
- aura::Window* menu_window = menu_controller_->owner()->GetNativeWindow();
- aura::Window* target_window = static_cast<aura::Window*>(
- static_cast<ui::EventTarget*>(menu_window->GetRootWindow())->
- GetEventTargeter()->FindTargetForEvent(menu_window,
- ui_event.get()));
- // TODO(flackr): The event shouldn't be handled if target_window is not
- // menu_window, however the event targeter does not properly target the
- // open menu. For now, we allow targeters to prevent handling by the menu.
- if (!target_window)
- should_process_event = false;
- }
-
- if (menu_controller_->exit_type() != MenuController::EXIT_ALL &&
- menu_controller_->exit_type() != MenuController::EXIT_DESTROYED &&
- ui_event && should_process_event) {
- switch (ui_event->type()) {
- case ui::ET_KEY_PRESSED: {
- should_perform_default = false;
-
- ui::KeyEvent* key_event = static_cast<ui::KeyEvent*>(ui_event.get());
- menu_controller_->OnKeyDown(key_event->key_code());
- if (menu_controller_->exit_type() != MenuController::EXIT_NONE)
- break;
-
- // Do not check mnemonics if the Alt or Ctrl modifiers are pressed.
- int flags = key_event->flags();
- if ((flags & (ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)) == 0) {
- char c = ui::DomCodeToUsLayoutCharacter(key_event->code(), flags);
- menu_controller_->SelectByChar(c);
- }
- break;
- }
- case ui::ET_KEY_RELEASED:
- should_perform_default = false;
- break;
- case ui::ET_TOUCH_RELEASED:
- case ui::ET_TOUCH_CANCELLED:
- // Don't allow the event copy to clear the native touch id
- // mapping, or we'll lose the mapping before the initial event
- // has finished being dispatched.
- static_cast<ui::TouchEvent*>(ui_event.get())
- ->set_should_remove_native_touch_id_mapping(false);
- break;
- default:
- break;
- }
- }
-
- menu_controller_->TerminateNestedMessageLoopIfNecessary();
-
- return should_perform_default ? ui::POST_DISPATCH_PERFORM_DEFAULT
- : ui::POST_DISPATCH_NONE;
-}
-
-} // namespace internal
-} // namespace views
« no previous file with comments | « ui/views/controls/menu/menu_event_dispatcher.h ('k') | ui/views/views.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698