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

Unified Diff: views/focus/accelerator_handler.h

Issue 8588064: views: Move bubble, events, focus and layout to ui/views/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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 | « views/events/event_x.cc ('k') | views/focus/accelerator_handler_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/focus/accelerator_handler.h
diff --git a/views/focus/accelerator_handler.h b/views/focus/accelerator_handler.h
index 71f86880e68747ae6cf17c35fed3666f7b0e7a28..5eef62ac55b6152eaa6bf2e24cc29ca3b9345a29 100644
--- a/views/focus/accelerator_handler.h
+++ b/views/focus/accelerator_handler.h
@@ -6,56 +6,7 @@
#define VIEWS_FOCUS_ACCELERATOR_HANDLER_H_
#pragma once
-#include "build/build_config.h"
-
-#if defined(TOOLKIT_USES_GTK)
-#include <gdk/gdk.h>
-#endif
-
-#include <set>
-#include <vector>
-
-#include "base/message_loop.h"
-#include "views/views_export.h"
-
-namespace views {
-
-#if (defined(TOUCH_UI) && !defined(USE_WAYLAND)) \
- || (!defined(OS_WIN) && defined(USE_AURA))
-// Dispatch an XEvent to the RootView. Return true if the event was dispatched
-// and handled, false otherwise.
-bool VIEWS_EXPORT DispatchXEvent(XEvent* xevent);
-
-#endif // TOUCH_UI
-
-// This class delegates the key messages to the associated FocusManager class
-// for the window that is receiving these messages for accelerator processing.
-class VIEWS_EXPORT AcceleratorHandler : public MessageLoop::Dispatcher {
- public:
- AcceleratorHandler();
-
- // Dispatcher method. This returns true if an accelerator was processed by the
- // focus manager
-#if defined(OS_WIN)
- virtual bool Dispatch(const MSG& msg);
-#elif defined(USE_WAYLAND)
- virtual base::MessagePumpDispatcher::DispatchStatus Dispatch(
- base::wayland::WaylandEvent* ev);
-#elif defined(TOUCH_UI) || defined(USE_AURA)
- virtual base::MessagePumpDispatcher::DispatchStatus Dispatch(XEvent* xev);
-#else
- virtual bool Dispatch(GdkEvent* event);
-#endif
-
- private:
-#if defined(OS_WIN)
- // The keys currently pressed and consumed by the FocusManager.
- std::set<WPARAM> pressed_keys_;
-#endif
-
- DISALLOW_COPY_AND_ASSIGN(AcceleratorHandler);
-};
-
-} // namespace views
+#include "ui/views/focus/accelerator_handler.h"
+// TODO(tfarina): remove this file once all includes have been updated.
#endif // VIEWS_FOCUS_ACCELERATOR_HANDLER_H_
« no previous file with comments | « views/events/event_x.cc ('k') | views/focus/accelerator_handler_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698