diff options
| author | mfomitchev@chromium.org <mfomitchev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-05 22:06:16 +0000 |
|---|---|---|
| committer | mfomitchev@chromium.org <mfomitchev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-05 22:06:16 +0000 |
| commit | 1ece0b6bc17519c50fd3c15df95060953c082894 (patch) | |
| tree | 7c39fa11c19b7c54fc24fa283b6734a3e37714c2 /ash/shelf/shelf_view_unittest.cc | |
| parent | 7aa9682d0500b2f8e8db0f80c7d9e32d490e22ee (diff) | |
| download | chromium_src-1ece0b6bc17519c50fd3c15df95060953c082894.zip chromium_src-1ece0b6bc17519c50fd3c15df95060953c082894.tar.gz chromium_src-1ece0b6bc17519c50fd3c15df95060953c082894.tar.bz2 | |
Moving coordinate conversion methods from ash/wm to ui/wm.
Moving ConvertPointToScreen and ConvertPointFromScreen from ash::wm into
aura::Window. The suggestion to do this was made here:
https://codereview.chromium.org/420603011/diff/1/athena/wm/coordinate_conversion.h
BUG=NONE
Review URL: https://codereview.chromium.org/425363002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287609 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shelf/shelf_view_unittest.cc')
| -rw-r--r-- | ash/shelf/shelf_view_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/shelf/shelf_view_unittest.cc b/ash/shelf/shelf_view_unittest.cc index 1d7a8d0..fc9b076 100644 --- a/ash/shelf/shelf_view_unittest.cc +++ b/ash/shelf/shelf_view_unittest.cc @@ -29,7 +29,6 @@ #include "ash/test/shell_test_api.h" #include "ash/test/test_shelf_delegate.h" #include "ash/test/test_shelf_item_delegate.h" -#include "ash/wm/coordinate_conversion.h" #include "base/basictypes.h" #include "base/command_line.h" #include "base/compiler_specific.h" @@ -47,6 +46,7 @@ #include "ui/views/view_model.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_delegate.h" +#include "ui/wm/core/coordinate_conversion.h" namespace ash { namespace test { @@ -1604,7 +1604,7 @@ TEST_F(ShelfViewTest, CheckRipOffFromLeftShelfAlignmentWithMultiMonitor) { // Fetch the start point of dragging. gfx::Point start_point = button->GetBoundsInScreen().CenterPoint(); - wm::ConvertPointFromScreen(second_root, &start_point); + ::wm::ConvertPointFromScreen(second_root, &start_point); ui::test::EventGenerator generator(second_root, start_point); |