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

Unified Diff: ui/aura/root_window.cc

Issue 10789018: aura: Add X11 host window management. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
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.cc
diff --git a/ui/aura/root_window.cc b/ui/aura/root_window.cc
index 6c45b2368fed4ba84e19cb7c219481a76ac1065b..5ffbc5838688cc4ac93a62352fb89c4ff7550c78 100644
--- a/ui/aura/root_window.cc
+++ b/ui/aura/root_window.cc
@@ -247,6 +247,13 @@ void RootWindow::ScheduleFullDraw() {
compositor_->ScheduleFullDraw();
}
+bool RootWindow::DispatchNativeEvent(const base::NativeEvent& native_event) {
+#if !defined(OS_MACOSX)
+ return host_->DispatchNativeEvent(native_event);
+#endif
+ return false;
+}
+
bool RootWindow::DispatchMouseEvent(MouseEvent* event) {
if (event->type() == ui::ET_MOUSE_DRAGGED ||
(event->flags() & ui::EF_IS_SYNTHESIZED)) {
@@ -442,6 +449,11 @@ void RootWindow::OnKeyboardMappingChanged() {
OnKeyboardMappingChanged(this));
}
+void RootWindow::OnCursorChanged(ui::PlatformCursor cursor) {
+ FOR_EACH_OBSERVER(RootWindowObserver, observers_,
+ OnCursorChanged(this, cursor));
+}
+
void RootWindow::OnRootWindowHostClosed() {
FOR_EACH_OBSERVER(RootWindowObserver, observers_,
OnRootWindowHostClosed(this));
@@ -480,6 +492,10 @@ gfx::AcceleratedWidget RootWindow::GetAcceleratedWidget() {
return host_->GetAcceleratedWidget();
}
+gfx::AcceleratedWidget RootWindow::GetAcceleratedWidgetUsedForEvents() {
+ return host_->GetAcceleratedWidgetUsedForEvents();
+}
+
void RootWindow::ToggleFullScreen() {
host_->ToggleFullScreen();
}

Powered by Google App Engine
This is Rietveld 408576698