browser: Enable DockInfo for Aura Linux besides X11

chrome/browser/ui/aura/tabs/dock_info_aura.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/tabs/dock_info.h"
 
 #include "chrome/browser/ui/host_desktop.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
+#if defined(USE_X11)
 #include "ui/base/x/x11_util.h"
-
-#if !defined(OS_CHROMEOS)
-#include "ui/views/widget/desktop_aura/desktop_root_window_host_x11.h"
 #endif
 
-#if !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS) && defined(USE_X11)
+#include "ui/views/widget/desktop_aura/desktop_root_window_host_x11.h"
 
 namespace {
 
 ////////////////////////////////////////////////////////////////////////////////
 // BaseWindowFinder
 //
 // Base class used to locate a window. A subclass need only override
 // ShouldStopIterating to determine when iteration should stop.
 class BaseWindowFinder : public ui::EnumerateWindowsDelegate {
  public:
@@ skipping 142 matching lines @@
   // The resulting window. This is initially null but set to true in
   // ShouldStopIterating if an appropriate window is found.
   XID result_;
 
   DISALLOW_COPY_AND_ASSIGN(LocalProcessWindowFinder);
 };
 
 }  // namespace
 
 // static
+gfx::NativeView DockInfo::GetLocalProcessWindowAtPoint(
+    chrome::HostDesktopType host_desktop_type,
+    const gfx::Point& screen_point,
+    const std::set<gfx::NativeView>& ignore) {
+  // The X11 server is the canonical state of what the window stacking order
+  // is.
+  XID xid =
+      LocalProcessWindowFinder::GetProcessWindowAtPoint(screen_point, ignore);
+  return views::DesktopRootWindowHostX11::GetContentWindowForXID(xid);
+}
+#endif
+
+// static
 DockInfo DockInfo::GetDockInfoAtPoint(chrome::HostDesktopType host_desktop_type,
                                       const gfx::Point& screen_point,
                                       const std::set<gfx::NativeView>& ignore) {
   // TODO(beng):
   NOTIMPLEMENTED();
   return DockInfo();
 }
 
 // static
 gfx::NativeView DockInfo::GetLocalProcessWindowAtPoint(

[Ben Goodger (Google), 2013/10/23 17:39:28]

shouldn't this be in #else?

[vignatti (out of this project), 2013/10/24 07:46:20]

yes, obviously!

     chrome::HostDesktopType host_desktop_type,
     const gfx::Point& screen_point,
     const std::set<gfx::NativeView>& ignore) {
-  // The X11 server is the canonical state of what the window stacking order
-  // is.
-  XID xid =
-      LocalProcessWindowFinder::GetProcessWindowAtPoint(screen_point, ignore);
-  return views::DesktopRootWindowHostX11::GetContentWindowForXID(xid);
+
+  // TODO(vignatti):
+  NOTIMPLEMENTED();
+  return NULL;
 }
 
 bool DockInfo::GetWindowBounds(gfx::Rect* bounds) const {
   if (!window())
     return false;
   *bounds = window_->bounds();
   return true;
 }
 
 void DockInfo::SizeOtherWindowTo(const gfx::Rect& bounds) const {
   window_->SetBounds(bounds);
 }
-
-#endif