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

Unified Diff: ui/gfx/native_widget_types.h

Issue 17265006: wayland patch for inspection Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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/base/wayland/events_wayland.cc ('k') | ui/gl/gl.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/native_widget_types.h
diff --git a/ui/gfx/native_widget_types.h b/ui/gfx/native_widget_types.h
index eb6dcb4b762103891bdc09286a341e8e63dbbe40..483f8da43e29e9a383b8eb94cfa5d30cad2d3e67 100644
--- a/ui/gfx/native_widget_types.h
+++ b/ui/gfx/native_widget_types.h
@@ -112,6 +112,10 @@ namespace ui {
class WindowAndroid;
class ViewAndroid;
}
+#elif defined(USE_WAYLAND)
+namespace ui {
+class WaylandWindow;
+}
#endif
class SkBitmap;
@@ -253,6 +257,9 @@ static inline NativeView NativeViewFromIdInBrowser(NativeViewId id) {
#elif defined(USE_OZONE)
typedef intptr_t PluginWindowHandle;
const PluginWindowHandle kNullPluginWindow = 0;
+#elif defined(USE_WAYLAND)
+ typedef ui::WaylandWindow* PluginWindowHandle;
+ const PluginWindowHandle kNullPluginWindow = NULL;
#else
// On OS X we don't have windowed plugins.
// We use a NULL/0 PluginWindowHandle in shared code to indicate there
@@ -321,6 +328,9 @@ const AcceleratedWidget kNullAcceleratedWidget = 0;
#elif defined(USE_OZONE)
typedef intptr_t AcceleratedWidget;
const AcceleratedWidget kNullAcceleratedWidget = 0;
+#elif defined(USE_WAYLAND)
+typedef ui::WaylandWindow* AcceleratedWidget;
+const AcceleratedWidget kNullAcceleratedWidget = NULL;
#else
#error unknown platform
#endif
« no previous file with comments | « ui/base/wayland/events_wayland.cc ('k') | ui/gl/gl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698