| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "ash/shell.h" | 7 #include "ash/wm/coordinate_conversion.h" |
| 8 #include "ui/aura/client/screen_position_client.h" | 8 #include "ui/aura/client/screen_position_client.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" |
| 11 #include "ui/compositor/layer.h" | 11 #include "ui/compositor/layer.h" |
| 12 | 12 |
| 13 // DockInfo ------------------------------------------------------------------- | 13 // DockInfo ------------------------------------------------------------------- |
| 14 | 14 |
| 15 namespace { | 15 namespace { |
| 16 | 16 |
| 17 aura::Window* GetLocalProcessWindowAtPointImpl( | 17 aura::Window* GetLocalProcessWindowAtPointImpl( |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 // TODO(beng): | 49 // TODO(beng): |
| 50 NOTIMPLEMENTED(); | 50 NOTIMPLEMENTED(); |
| 51 return DockInfo(); | 51 return DockInfo(); |
| 52 } | 52 } |
| 53 | 53 |
| 54 // static | 54 // static |
| 55 gfx::NativeView DockInfo::GetLocalProcessWindowAtPoint( | 55 gfx::NativeView DockInfo::GetLocalProcessWindowAtPoint( |
| 56 const gfx::Point& screen_point, | 56 const gfx::Point& screen_point, |
| 57 const std::set<gfx::NativeView>& ignore) { | 57 const std::set<gfx::NativeView>& ignore) { |
| 58 return GetLocalProcessWindowAtPointImpl( | 58 return GetLocalProcessWindowAtPointImpl( |
| 59 screen_point, ignore, ash::Shell::GetRootWindowAt(screen_point)); | 59 screen_point, ignore, ash::wm::GetRootWindowAt(screen_point)); |
| 60 } | 60 } |
| 61 | 61 |
| 62 bool DockInfo::GetWindowBounds(gfx::Rect* bounds) const { | 62 bool DockInfo::GetWindowBounds(gfx::Rect* bounds) const { |
| 63 if (!window()) | 63 if (!window()) |
| 64 return false; | 64 return false; |
| 65 *bounds = window_->bounds(); | 65 *bounds = window_->bounds(); |
| 66 return true; | 66 return true; |
| 67 } | 67 } |
| 68 | 68 |
| 69 void DockInfo::SizeOtherWindowTo(const gfx::Rect& bounds) const { | 69 void DockInfo::SizeOtherWindowTo(const gfx::Rect& bounds) const { |
| 70 window_->SetBounds(bounds); | 70 window_->SetBounds(bounds); |
| 71 } | 71 } |
| OLD | NEW |