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

Unified Diff: chrome/browser/ui/aura/tabs/dock_info_aura.cc

Issue 29493004: browser: Enable DockInfo for Aura Linux besides X11 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 2 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
« no previous file with comments | « no previous file | chrome/browser/ui/aura/tabs/dock_info_aurax11.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/aura/tabs/dock_info_aura.cc
diff --git a/chrome/browser/ui/aura/tabs/dock_info_aurax11.cc b/chrome/browser/ui/aura/tabs/dock_info_aura.cc
similarity index 95%
rename from chrome/browser/ui/aura/tabs/dock_info_aurax11.cc
rename to chrome/browser/ui/aura/tabs/dock_info_aura.cc
index 274f5c206e3d40ba84055a97a3b18d13c2a79d8b..64454e64b8e43c4941fac354603a7e7709f9c277 100644
--- a/chrome/browser/ui/aura/tabs/dock_info_aurax11.cc
+++ b/chrome/browser/ui/aura/tabs/dock_info_aura.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,6 +175,19 @@ class LocalProcessWindowFinder : public BaseWindowFinder {
} // 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) {
@@ -189,11 +201,10 @@ 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);
+
+ // TODO(vignatti):
+ NOTIMPLEMENTED();
+ return NULL;
}
bool DockInfo::GetWindowBounds(gfx::Rect* bounds) const {
@@ -206,5 +217,3 @@ bool DockInfo::GetWindowBounds(gfx::Rect* bounds) const {
void DockInfo::SizeOtherWindowTo(const gfx::Rect& bounds) const {
window_->SetBounds(bounds);
}
-
-#endif
« no previous file with comments | « no previous file | chrome/browser/ui/aura/tabs/dock_info_aurax11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698