Chromium Code Reviews (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out

Unified Diff: ui/aura/root_window_host_linux.h

Issue 10789018: aura: Add X11 host window management. (Closed) Base URL: svn://
Patch Set: Keep ash switches alphabetized. Created 8 years, 5 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
Index: ui/aura/root_window_host_linux.h
diff --git a/ui/aura/root_window_host_linux.h b/ui/aura/root_window_host_linux.h
index 9d045eb0b42f1221f889b420607b0bd978d297c8..382c5dbe078fafa2370e9221bdde0fb55e0314a9 100644
--- a/ui/aura/root_window_host_linux.h
+++ b/ui/aura/root_window_host_linux.h
@@ -36,6 +36,7 @@ class RootWindowHostLinux : public RootWindowHost,
virtual void SetRootWindow(RootWindow* root_window) OVERRIDE;
virtual RootWindow* GetRootWindow() OVERRIDE;
virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE;
+ virtual gfx::AcceleratedWidget GetAcceleratedWidgetUsedForEvents() OVERRIDE;
virtual void Show() OVERRIDE;
virtual void ToggleFullScreen() OVERRIDE;
virtual gfx::Rect GetBounds() const OVERRIDE;
@@ -54,6 +55,7 @@ class RootWindowHostLinux : public RootWindowHost,
const gfx::Rect& snapshot_bounds,
std::vector<unsigned char>* png_representation) OVERRIDE;
virtual void PostNativeEvent(const base::NativeEvent& event) OVERRIDE;
+ virtual bool DispatchNativeEvent(const base::NativeEvent& event) OVERRIDE;
virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE;
// Returns true if there's an X window manager present... in most cases. Some
@@ -70,6 +72,7 @@ class RootWindowHostLinux : public RootWindowHost,
// The display and the native X window hosting the root window.
Display* xdisplay_;
::Window xwindow_;
+ ::Window x_output_window_;
// The native root window.
::Window x_root_window_;

Powered by Google App Engine
This is Rietveld 408576698