| Index: chrome/browser/ui/aura/tabs/dock_info_auralinux.cc
|
| diff --git a/chrome/browser/ui/aura/tabs/dock_info_aurax11.cc b/chrome/browser/ui/aura/tabs/dock_info_auralinux.cc
|
| similarity index 95%
|
| rename from chrome/browser/ui/aura/tabs/dock_info_aurax11.cc
|
| rename to chrome/browser/ui/aura/tabs/dock_info_auralinux.cc
|
| index 2a089b8bdd078aa152010f6bb1d688017ff7199e..527e2403e3a47846957f0b4a60eecc3431982044 100644
|
| --- a/chrome/browser/ui/aura/tabs/dock_info_aurax11.cc
|
| +++ b/chrome/browser/ui/aura/tabs/dock_info_auralinux.cc
|
| @@ -7,13 +7,12 @@
|
| #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 {
|
|
|
| @@ -176,15 +175,6 @@ class LocalProcessWindowFinder : public BaseWindowFinder {
|
| } // namespace
|
|
|
| // 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(
|
| chrome::HostDesktopType host_desktop_type,
|
| const gfx::Point& screen_point,
|
| @@ -195,6 +185,27 @@ gfx::NativeView DockInfo::GetLocalProcessWindowAtPoint(
|
| LocalProcessWindowFinder::GetProcessWindowAtPoint(screen_point, ignore);
|
| return views::DesktopRootWindowHostX11::GetContentWindowForXID(xid);
|
| }
|
| +#else
|
| +// static
|
| +gfx::NativeView DockInfo::GetLocalProcessWindowAtPoint(
|
| + chrome::HostDesktopType host_desktop_type,
|
| + const gfx::Point& screen_point,
|
| + const std::set<gfx::NativeView>& ignore) {
|
| +
|
| + // TODO(vignatti):
|
| + NOTIMPLEMENTED();
|
| + return NULL;
|
| +}
|
| +#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();
|
| +}
|
|
|
| bool DockInfo::GetWindowBounds(gfx::Rect* bounds) const {
|
| if (!window())
|
| @@ -206,5 +217,3 @@ bool DockInfo::GetWindowBounds(gfx::Rect* bounds) const {
|
| void DockInfo::SizeOtherWindowTo(const gfx::Rect& bounds) const {
|
| window_->SetBounds(bounds);
|
| }
|
| -
|
| -#endif
|
|
|