diff options
author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-26 19:20:28 +0000 |
---|---|---|
committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-26 19:20:28 +0000 |
commit | 40c15eb2c9d846fe70502e1f50ff7c2d6cb4ff67 (patch) | |
tree | ab9417f1e5345354ca8a5b47f3876536a87d297c /ui/aura/root_window_host_linux.cc | |
parent | fdede0fc51e8b8801a861f76d1a9d6d7c329a69d (diff) | |
download | chromium_src-40c15eb2c9d846fe70502e1f50ff7c2d6cb4ff67.zip chromium_src-40c15eb2c9d846fe70502e1f50ff7c2d6cb4ff67.tar.gz chromium_src-40c15eb2c9d846fe70502e1f50ff7c2d6cb4ff67.tar.bz2 |
Make views_examples work in aura without ash.
This required a ScreenImpl implementation for windows+aura.
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10241005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134136 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/root_window_host_linux.cc')
-rw-r--r-- | ui/aura/root_window_host_linux.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/ui/aura/root_window_host_linux.cc b/ui/aura/root_window_host_linux.cc index fc2206f..cb2a551 100644 --- a/ui/aura/root_window_host_linux.cc +++ b/ui/aura/root_window_host_linux.cc @@ -594,6 +594,10 @@ void RootWindowHostLinux::SetRootWindow(RootWindow* root_window) { root_window_ = root_window; } +RootWindow* RootWindowHostLinux::GetRootWindow() { + return root_window_; +} + gfx::AcceleratedWidget RootWindowHostLinux::GetAcceleratedWidget() { return xwindow_; } @@ -800,6 +804,13 @@ RootWindowHost* RootWindowHost::Create(const gfx::Rect& bounds) { } // static +RootWindowHost* RootWindowHost::GetForAcceleratedWidget( + gfx::AcceleratedWidget accelerated_widget) { + NOTIMPLEMENTED(); + return NULL; // TODO(erg): implement if necessary or remove this comment. +} + +// static gfx::Size RootWindowHost::GetNativeScreenSize() { ::Display* xdisplay = base::MessagePumpX::GetDefaultXDisplay(); return gfx::Size(DisplayWidth(xdisplay, 0), DisplayHeight(xdisplay, 0)); |