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

Unified Diff: trunk/src/ui/wm/core/nested_accelerator_dispatcher_win.cc

Issue 300093002: Revert 272740 "Refactor and move ash independent accelerator han..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 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 | « trunk/src/ui/wm/core/nested_accelerator_dispatcher_linux.cc ('k') | trunk/src/ui/wm/wm.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ui/wm/core/nested_accelerator_dispatcher_win.cc
===================================================================
--- trunk/src/ui/wm/core/nested_accelerator_dispatcher_win.cc (revision 272758)
+++ trunk/src/ui/wm/core/nested_accelerator_dispatcher_win.cc (working copy)
@@ -1,67 +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/wm/core/nested_accelerator_dispatcher.h"
-
-#include "base/memory/scoped_ptr.h"
-#include "base/message_loop/message_pump_dispatcher.h"
-#include "base/run_loop.h"
-#include "ui/events/event.h"
-#include "ui/wm/core/nested_accelerator_delegate.h"
-
-using base::MessagePumpDispatcher;
-
-namespace wm {
-
-namespace {
-
-bool IsKeyEvent(const MSG& msg) {
- return msg.message == WM_KEYDOWN || msg.message == WM_SYSKEYDOWN ||
- msg.message == WM_KEYUP || msg.message == WM_SYSKEYUP;
-}
-
-} // namespace
-
-class NestedAcceleratorDispatcherWin : public NestedAcceleratorDispatcher,
- public MessagePumpDispatcher {
- public:
- NestedAcceleratorDispatcherWin(NestedAcceleratorDelegate* delegate,
- MessagePumpDispatcher* nested)
- : NestedAcceleratorDispatcher(delegate), nested_dispatcher_(nested) {}
- virtual ~NestedAcceleratorDispatcherWin() {}
-
- private:
- // NestedAcceleratorDispatcher:
- virtual scoped_ptr<base::RunLoop> CreateRunLoop() OVERRIDE {
- return scoped_ptr<base::RunLoop>(new base::RunLoop(this));
- }
-
- // MessagePumpDispatcher:
- virtual uint32_t Dispatch(const MSG& event) OVERRIDE {
- if (IsKeyEvent(event)) {
- ui::KeyEvent key_event(event, false);
- if (!delegate_->ShouldProcessEventNow(key_event))
- return POST_DISPATCH_QUIT_LOOP;
-
- if (delegate_->ProcessEvent(key_event))
- return POST_DISPATCH_NONE;
- }
-
- return nested_dispatcher_ ? nested_dispatcher_->Dispatch(event)
- : POST_DISPATCH_PERFORM_DEFAULT;
- }
-
- MessagePumpDispatcher* nested_dispatcher_;
-
- DISALLOW_COPY_AND_ASSIGN(NestedAcceleratorDispatcherWin);
-};
-
-scoped_ptr<NestedAcceleratorDispatcher> NestedAcceleratorDispatcher::Create(
- NestedAcceleratorDelegate* delegate,
- MessagePumpDispatcher* nested_dispatcher) {
- return scoped_ptr<NestedAcceleratorDispatcher>(
- new NestedAcceleratorDispatcherWin(delegate, nested_dispatcher));
-}
-
-} // namespace wm
« no previous file with comments | « trunk/src/ui/wm/core/nested_accelerator_dispatcher_linux.cc ('k') | trunk/src/ui/wm/wm.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698