| Index: ui/views/view.cc
|
| diff --git a/ui/views/view.cc b/ui/views/view.cc
|
| index 3c2aed7dbab63c64d06b4554d32574d33b66d92f..883414ed6720e891d42cd84f28736f755122c912 100644
|
| --- a/ui/views/view.cc
|
| +++ b/ui/views/view.cc
|
| @@ -679,11 +679,10 @@ void View::ConvertPointToScreen(const View* src, gfx::Point* p) {
|
| DCHECK(p);
|
|
|
| // If the view is not connected to a tree, there's nothing we can do.
|
| + ConvertPointToWidget(src, p);
|
| const Widget* widget = src->GetWidget();
|
| - if (widget) {
|
| - ConvertPointToWidget(src, p);
|
| + if (widget)
|
| *p += widget->GetClientAreaBoundsInScreen().OffsetFromOrigin();
|
| - }
|
| }
|
|
|
| // static
|
| @@ -692,9 +691,8 @@ void View::ConvertPointFromScreen(const View* dst, gfx::Point* p) {
|
| DCHECK(p);
|
|
|
| const views::Widget* widget = dst->GetWidget();
|
| - if (!widget)
|
| - return;
|
| - *p -= widget->GetClientAreaBoundsInScreen().OffsetFromOrigin();
|
| + if (widget)
|
| + *p -= widget->GetClientAreaBoundsInScreen().OffsetFromOrigin();
|
| views::View::ConvertPointFromWidget(dst, p);
|
| }
|
|
|
|
|