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

Unified Diff: views/widget/tooltip_manager_views.h

Issue 7464027: Wayland support for views. views_desktop on Wayland. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Updated native_widget_wayland.cc to match compositor changes Created 9 years, 4 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 | « views/widget/native_widget_wayland.cc ('k') | views/widget/tooltip_manager_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/widget/tooltip_manager_views.h
diff --git a/views/widget/tooltip_manager_views.h b/views/widget/tooltip_manager_views.h
index 8bffaed3de12701fc40289ea54902db266388cf8..648c7cb58bd49d307c70f6f79375d746100feff9 100644
--- a/views/widget/tooltip_manager_views.h
+++ b/views/widget/tooltip_manager_views.h
@@ -7,7 +7,6 @@
#pragma once
#include "base/message_loop.h"
-#include "base/message_pump_x.h"
#include "base/timer.h"
#include "views/controls/label.h"
#include "views/widget/native_widget.h"
@@ -17,6 +16,9 @@
typedef union _GdkEvent GdkEvent;
typedef union _XEvent XEvent;
+namespace ui {
+union WaylandEvent;
+}
namespace views {
@@ -39,9 +41,14 @@ class TooltipManagerViews : public TooltipManager,
virtual void ShowKeyboardTooltip(View* view) OVERRIDE;
virtual void HideKeyboardTooltip() OVERRIDE;
+#if defined(USE_WAYLAND)
+ virtual base::MessagePumpObserver::EventStatus WillProcessEvent(
+ ui::WaylandEvent* event) OVERRIDE;
+#else
// MessageLoopForUI::Observer
virtual base::MessagePumpObserver::EventStatus WillProcessXEvent(
XEvent* xevent) OVERRIDE;
+#endif
private:
void TooltipTimerFired();
« no previous file with comments | « views/widget/native_widget_wayland.cc ('k') | views/widget/tooltip_manager_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698