Index: chrome/browser/ui/views/tabs/window_finder.cc |
diff --git a/chrome/browser/ui/views/tabs/window_finder.cc b/chrome/browser/ui/views/tabs/window_finder.cc |
index 7f95d12d1a6b89961bacfdba9ec57c6dac19b6f3..2637d2449cb40b8aae095658b4ed4eb8d2d3e6a5 100644 |
--- a/chrome/browser/ui/views/tabs/window_finder.cc |
+++ b/chrome/browser/ui/views/tabs/window_finder.cc |
@@ -4,5 +4,29 @@ |
#include "chrome/browser/ui/views/tabs/window_finder.h" |
+#include "content/public/common/service_manager_connection.h" |
+#include "services/service_manager/runner/common/client_util.h" |
fwang
2016/10/26 07:42:58
It looks like these should be in a
#if defined(USE
tonikitoo
2016/10/26 13:41:45
Done.
|
+ |
+#if defined(USE_AURA) && !defined(OS_MACOSX) |
+gfx::NativeWindow GetLocalProcessWindowAtPointMus( |
+ const gfx::Point& screen_point, |
+ const std::set<gfx::NativeWindow>& ignore); |
+#endif |
+ |
WindowFinder::WindowFinder() {} |
+ |
WindowFinder::~WindowFinder() {} |
+ |
+gfx::NativeWindow WindowFinder::GetLocalProcessWindowAtPoint( |
+ const gfx::Point& screen_point, |
+ const std::set<gfx::NativeWindow>& ignore) { |
+#if defined(USE_AURA) && !defined(OS_MACOSX) |
+ content::ServiceManagerConnection* service_manager_connection = |
+ content::ServiceManagerConnection::GetForProcess(); |
+ if (service_manager_connection && service_manager::ServiceManagerIsRemote()) |
+ return GetLocalProcessWindowAtPointMus(screen_point, ignore); |
+ else |
fwang
2016/10/26 07:42:58
The else is no longer necessary since we leave the
tonikitoo
2016/10/26 13:41:46
Done.
|
+#endif |
+ |
+ return GetLocalProcessWindowAtPointImpl(screen_point, ignore); |
+} |