OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/tabs/dock_info.h" | 5 #include "chrome/browser/ui/tabs/dock_info.h" |
6 | 6 |
7 #include "base/debug/trace_event.h" | 7 #include "base/debug/trace_event.h" |
8 #include "chrome/browser/ui/host_desktop.h" | 8 #include "chrome/browser/ui/host_desktop.h" |
9 #include "ui/aura/root_window.h" | 9 #include "ui/aura/root_window.h" |
10 #include "ui/aura/window.h" | 10 #include "ui/aura/window.h" |
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
180 chrome::HostDesktopType host_desktop_type, | 180 chrome::HostDesktopType host_desktop_type, |
181 const gfx::Point& screen_point, | 181 const gfx::Point& screen_point, |
182 const std::set<gfx::NativeView>& ignore) { | 182 const std::set<gfx::NativeView>& ignore) { |
183 TRACE_EVENT1("ui", "DockInfo::GetLocalProcessWindowAtPoint", | 183 TRACE_EVENT1("ui", "DockInfo::GetLocalProcessWindowAtPoint", |
184 "screen_point", screen_point.ToString()); | 184 "screen_point", screen_point.ToString()); |
185 | 185 |
186 // The X11 server is the canonical state of what the window stacking order | 186 // The X11 server is the canonical state of what the window stacking order |
187 // is. | 187 // is. |
188 XID xid = | 188 XID xid = |
189 LocalProcessWindowFinder::GetProcessWindowAtPoint(screen_point, ignore); | 189 LocalProcessWindowFinder::GetProcessWindowAtPoint(screen_point, ignore); |
190 return views::DesktopRootWindowHostX11::GetContentWindowForXID(xid); | 190 return views::DesktopWindowTreeHostX11::GetContentWindowForXID(xid); |
191 } | 191 } |
192 #else | 192 #else |
193 // static | 193 // static |
194 gfx::NativeView DockInfo::GetLocalProcessWindowAtPoint( | 194 gfx::NativeView DockInfo::GetLocalProcessWindowAtPoint( |
195 chrome::HostDesktopType host_desktop_type, | 195 chrome::HostDesktopType host_desktop_type, |
196 const gfx::Point& screen_point, | 196 const gfx::Point& screen_point, |
197 const std::set<gfx::NativeView>& ignore) { | 197 const std::set<gfx::NativeView>& ignore) { |
198 | 198 |
199 // TODO(vignatti): | 199 // TODO(vignatti): |
200 NOTIMPLEMENTED(); | 200 NOTIMPLEMENTED(); |
(...skipping 13 matching lines...) Expand all Loading... |
214 bool DockInfo::GetWindowBounds(gfx::Rect* bounds) const { | 214 bool DockInfo::GetWindowBounds(gfx::Rect* bounds) const { |
215 if (!window()) | 215 if (!window()) |
216 return false; | 216 return false; |
217 *bounds = window_->bounds(); | 217 *bounds = window_->bounds(); |
218 return true; | 218 return true; |
219 } | 219 } |
220 | 220 |
221 void DockInfo::SizeOtherWindowTo(const gfx::Rect& bounds) const { | 221 void DockInfo::SizeOtherWindowTo(const gfx::Rect& bounds) const { |
222 window_->SetBounds(bounds); | 222 window_->SetBounds(bounds); |
223 } | 223 } |
OLD | NEW |