src/ozone/patches/0004-Add-support-for-checking-DesktopWindow-with-Ozone-an.patch

   1 From c2dedcc846ca474df2f74946fdf0b22b07d565bd Mon Sep 17 00:00:00 2001
   2 From: Kondapally Kalyan <kalyan.kondapally@intel.com>
   3 Date: Tue, 17 Jun 2014 20:24:19 +0300
   4 Subject: [PATCH 4/5] Add support for checking DesktopWindow with Ozone and
   5  Ash.
   6
   7 Only windows hosted by a DesktopWindowTreeHost implementation can be mapped
   8 back to a content Window. All others, therefore, must be the root window
   9 for an Ash display. This check is done in ActiveDesktopMonitor. This patch
  10 adds the needed support for Ozone and should be upstreamed after
  11 https://codereview.chromium.org/36953002/ lands.
  12 ---
  13  chrome/browser/ui/aura/active_desktop_monitor.cc |    6 ++++++
  14  1 file changed, 6 insertions(+)
  15
  16 diff --git a/chrome/browser/ui/aura/active_desktop_monitor.cc b/chrome/browser/ui/aura/active_desktop_monitor.cc
  17 index f6c5a7b..626576ba 100644
  18 --- a/chrome/browser/ui/aura/active_desktop_monitor.cc
  19 +++ b/chrome/browser/ui/aura/active_desktop_monitor.cc
  20 @@ -11,6 +11,8 @@
  21  #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h"
  22  #elif defined(OS_WIN)
  23  #include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h"
  24 +#elif defined(USE_OZONE)
  25 +#include "ozone/ui/desktop_aura/desktop_window_tree_host_wayland.h"
  26  #endif
  27
  28  // static
  29 @@ -48,6 +50,10 @@ bool ActiveDesktopMonitor::IsDesktopWindow(aura::WindowTreeHost* host) {
  30  #elif defined(USE_X11)
  31    return views::DesktopWindowTreeHostX11::GetContentWindowForXID(
  32        host->GetAcceleratedWidget()) != NULL;
  33 +#elif defined(USE_OZONE)
  34 +  return views::DesktopWindowTreeHostWayland::
  35 +      GetContentWindowForAcceleratedWidget(
  36 +          host->GetAcceleratedWidget()) != NULL;
  37  #else
  38    NOTREACHED();
  39    return true;
  40 --
  41 1.7.9.5
  42