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

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

Issue 1625313002: Remove MenuMessagePumpDispatcher (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Replaced typedef with using Created 4 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 | « ui/views/controls/menu/menu_message_pump_dispatcher_win.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_message_pump_dispatcher_win.cc
diff --git a/ui/views/controls/menu/menu_message_pump_dispatcher_win.cc b/ui/views/controls/menu/menu_message_pump_dispatcher_win.cc
deleted file mode 100644
index 9ac6683ad9ce0b650d0275c3948ebae515a7361e..0000000000000000000000000000000000000000
--- a/ui/views/controls/menu/menu_message_pump_dispatcher_win.cc
+++ /dev/null
@@ -1,70 +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_message_pump_dispatcher_win.h"
-
-#include <windowsx.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/controls/menu/menu_item_view.h"
-
-namespace views {
-namespace internal {
-
-MenuMessagePumpDispatcher::MenuMessagePumpDispatcher(MenuController* controller)
- : menu_controller_(controller) {}
-
-MenuMessagePumpDispatcher::~MenuMessagePumpDispatcher() {}
-
-uint32_t MenuMessagePumpDispatcher::Dispatch(const MSG& msg) {
- DCHECK(menu_controller_->IsBlockingRun());
-
- bool should_perform_default = true;
- if (menu_controller_->exit_type() != MenuController::EXIT_ALL &&
- menu_controller_->exit_type() != MenuController::EXIT_DESTROYED) {
- // NOTE: we don't get WM_ACTIVATE or anything else interesting in here.
- switch (msg.message) {
- // NOTE: focus wasn't changed when the menu was shown. As such, don't
- // dispatch key events otherwise the focused window will get the events.
- case WM_KEYDOWN: {
- menu_controller_->OnKeyDown(ui::KeyboardCodeFromNative(msg));
- TranslateMessage(&msg);
- should_perform_default = false;
- break;
- }
- case WM_CHAR: {
- menu_controller_->SelectByChar(static_cast<base::char16>(msg.wParam));
- should_perform_default = false;
- break;
- }
- case WM_KEYUP:
- case WM_SYSKEYUP:
- // We may have been shown on a system key, as such don't do anything
- // here. If another system key is pushed we'll get a WM_SYSKEYDOWN and
- // close the menu.
- should_perform_default = false;
- break;
-
- case WM_CANCELMODE:
- case WM_SYSKEYDOWN:
- // Exit immediately on system keys.
- menu_controller_->Cancel(MenuController::EXIT_ALL);
- should_perform_default = false;
- break;
-
- default:
- break;
- }
- }
-
- menu_controller_->TerminateNestedMessageLoopIfNecessary();
- return should_perform_default ? POST_DISPATCH_PERFORM_DEFAULT
- : POST_DISPATCH_NONE;
-}
-
-} // namespace internal
-} // namespace views
« no previous file with comments | « ui/views/controls/menu/menu_message_pump_dispatcher_win.h ('k') | ui/views/views.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698