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

Unified Diff: ui/aura/root_window_host_mac.mm

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_host_mac.mm
diff --git a/ui/aura/root_window_host_mac.mm b/ui/aura/root_window_host_mac.mm
index 4c9f69aba826386f60a96cc4c5b06759810f300d..5c603c34220f1c68967ce99ac5fe6750d8c1c315 100644
--- a/ui/aura/root_window_host_mac.mm
+++ b/ui/aura/root_window_host_mac.mm
@@ -32,6 +32,7 @@ class RootWindowHostMac : public RootWindowHost,
// RootWindowHost:
virtual void SetRootWindow(RootWindow* root_window) OVERRIDE;
virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE;
+ virtual gfx::AcceleratedWidget GetAcceleratedWidgetUsedForEvents() OVERRIDE;
virtual void Show() OVERRIDE;
virtual void ToggleFullScreen() OVERRIDE;
virtual gfx::Size GetSize() const OVERRIDE;
@@ -123,6 +124,11 @@ gfx::AcceleratedWidget RootWindowHostMac::GetAcceleratedWidget() {
return [[controller_ window] contentView];
}
+gfx::AcceleratedWidget RootWindowHostMac::
+ GetAcceleratedWidgetUsedForEvents() {
+ return [[controller_ window] contentView];
+}
+
void RootWindowHostMac::Show() {
[controller_ showWindow:controller_];
}

Powered by Google App Engine
This is Rietveld 408576698