| 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/shell.h" |
| 8 #include "ui/aura/root_window.h" | 8 #include "ui/aura/root_window.h" |
| 9 #include "ui/aura/window.h" | 9 #include "ui/aura/window.h" |
| 10 #include "ui/compositor/layer.h" | 10 #include "ui/compositor/layer.h" |
| 11 | 11 |
| 12 // DockInfo ------------------------------------------------------------------- | 12 // DockInfo ------------------------------------------------------------------- |
| 13 | 13 |
| 14 namespace { | 14 namespace { |
| 15 | 15 |
| 16 aura::Window* GetLocalProcessWindowAtPointImpl( | 16 aura::Window* GetLocalProcessWindowAtPointImpl( |
| 17 const gfx::Point& screen_point, | 17 const gfx::Point& screen_point, |
| 18 const std::set<gfx::NativeView>& ignore, | 18 const std::set<gfx::NativeView>& ignore, |
| 19 aura::Window* window) { | 19 aura::Window* window) { |
| 20 if (ignore.find(window) != ignore.end()) | 20 if (ignore.find(window) != ignore.end()) |
| 21 return NULL; | 21 return NULL; |
| 22 | 22 |
| 23 if (!window->IsVisible()) | 23 if (!window->IsVisible()) |
| 24 return NULL; | 24 return NULL; |
| 25 | 25 |
| 26 if (window->layer()->type() == ui::LAYER_TEXTURED) { | 26 if (window->layer()->type() == ui::LAYER_TEXTURED) { |
| 27 gfx::Point window_point(screen_point); | 27 gfx::Point window_point(screen_point); |
| 28 aura::Window::ConvertPointToWindow(ash::Shell::GetRootWindow(), window, | 28 aura::Window::ConvertPointToWindow(ash::Shell::GetPrimaryRootWindow(), |
| 29 window, |
| 29 &window_point); | 30 &window_point); |
| 30 return gfx::Rect(window->bounds().size()).Contains(window_point) ? | 31 return gfx::Rect(window->bounds().size()).Contains(window_point) ? |
| 31 window : NULL; | 32 window : NULL; |
| 32 } | 33 } |
| 33 for (aura::Window::Windows::const_reverse_iterator i = | 34 for (aura::Window::Windows::const_reverse_iterator i = |
| 34 window->children().rbegin(); i != window->children().rend(); ++i) { | 35 window->children().rbegin(); i != window->children().rend(); ++i) { |
| 35 aura::Window* result = | 36 aura::Window* result = |
| 36 GetLocalProcessWindowAtPointImpl(screen_point, ignore, *i); | 37 GetLocalProcessWindowAtPointImpl(screen_point, ignore, *i); |
| 37 if (result) | 38 if (result) |
| 38 return result; | 39 return result; |
| 39 } | 40 } |
| 40 return NULL; | 41 return NULL; |
| 41 } | 42 } |
| 42 | 43 |
| 43 } // namespace | 44 } // namespace |
| 44 | 45 |
| 45 // static | 46 // static |
| 46 DockInfo DockInfo::GetDockInfoAtPoint(const gfx::Point& screen_point, | 47 DockInfo DockInfo::GetDockInfoAtPoint(const gfx::Point& screen_point, |
| 47 const std::set<gfx::NativeView>& ignore) { | 48 const std::set<gfx::NativeView>& ignore) { |
| 48 // TODO(beng): | 49 // TODO(beng): |
| 49 NOTIMPLEMENTED(); | 50 NOTIMPLEMENTED(); |
| 50 return DockInfo(); | 51 return DockInfo(); |
| 51 } | 52 } |
| 52 | 53 |
| 53 // static | 54 // static |
| 54 gfx::NativeView DockInfo::GetLocalProcessWindowAtPoint( | 55 gfx::NativeView DockInfo::GetLocalProcessWindowAtPoint( |
| 55 const gfx::Point& screen_point, | 56 const gfx::Point& screen_point, |
| 56 const std::set<gfx::NativeView>& ignore) { | 57 const std::set<gfx::NativeView>& ignore) { |
| 57 return GetLocalProcessWindowAtPointImpl( | 58 return GetLocalProcessWindowAtPointImpl( |
| 58 screen_point, ignore, ash::Shell::GetRootWindow()); | 59 screen_point, ignore, ash::Shell::GetPrimaryRootWindow()); |
| 59 } | 60 } |
| 60 | 61 |
| 61 bool DockInfo::GetWindowBounds(gfx::Rect* bounds) const { | 62 bool DockInfo::GetWindowBounds(gfx::Rect* bounds) const { |
| 62 if (!window()) | 63 if (!window()) |
| 63 return false; | 64 return false; |
| 64 *bounds = window_->bounds(); | 65 *bounds = window_->bounds(); |
| 65 return true; | 66 return true; |
| 66 } | 67 } |
| 67 | 68 |
| 68 void DockInfo::SizeOtherWindowTo(const gfx::Rect& bounds) const { | 69 void DockInfo::SizeOtherWindowTo(const gfx::Rect& bounds) const { |
| 69 window_->SetBounds(bounds); | 70 window_->SetBounds(bounds); |
| 70 } | 71 } |
| OLD | NEW |