diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-17 18:24:33 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-17 18:24:33 +0000 |
| commit | 55ad8c14c31df30801d8422e81b78322f95c0526 (patch) | |
| tree | c0fe47685194fd2137c658944589c439d93b0c8b /ash/wm/drag_window_resizer.cc | |
| parent | f3eccd0dfd02eb6b32c1a233e28439fc1a241d65 (diff) | |
| download | chromium_src-55ad8c14c31df30801d8422e81b78322f95c0526.zip chromium_src-55ad8c14c31df30801d8422e81b78322f95c0526.tar.gz chromium_src-55ad8c14c31df30801d8422e81b78322f95c0526.tar.bz2 | |
Screen cleanup:
* Split ScreenAsh to ScreenUtil (set of utility functions) and the screen implementation.
* moved screen_ash from Shell to DisplayManager. Ash specific imp is now hidden in DisplayManager.
* Shell now creates a separate screen object which simply keeps the list of displays for shutdown. This allow all screen operation valid during shutdown.
BUG=None
TBR=hongbo.min@intel.com,sky@chromium.org
Review URL: https://codereview.chromium.org/138003007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245562 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/drag_window_resizer.cc')
| -rw-r--r-- | ash/wm/drag_window_resizer.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ash/wm/drag_window_resizer.cc b/ash/wm/drag_window_resizer.cc index c678d16..263f399 100644 --- a/ash/wm/drag_window_resizer.cc +++ b/ash/wm/drag_window_resizer.cc @@ -6,7 +6,7 @@ #include "ash/display/mouse_cursor_event_filter.h" #include "ash/root_window_controller.h" -#include "ash/screen_ash.h" +#include "ash/screen_util.h" #include "ash/shell.h" #include "ash/system/tray/system_tray.h" #include "ash/system/user/tray_user.h" @@ -135,7 +135,7 @@ void DragWindowResizer::CompleteDrag() { bounds.set_height(size.height()); gfx::Rect dst_bounds = - ScreenAsh::ConvertRectToScreen(GetTarget()->parent(), bounds); + ScreenUtil::ConvertRectToScreen(GetTarget()->parent(), bounds); // Adjust the position so that the cursor is on the window. if (!dst_bounds.Contains(last_mouse_location_in_screen)) { @@ -189,7 +189,7 @@ void DragWindowResizer::UpdateDragWindow(const gfx::Rect& bounds, GetAnotherRootWindow(GetTarget()->GetRootWindow()); const gfx::Rect root_bounds_in_screen(another_root->GetBoundsInScreen()); const gfx::Rect bounds_in_screen = - ScreenAsh::ConvertRectToScreen(GetTarget()->parent(), bounds); + ScreenUtil::ConvertRectToScreen(GetTarget()->parent(), bounds); gfx::Rect bounds_in_another_root = gfx::IntersectRects(root_bounds_in_screen, bounds_in_screen); const float fraction_in_another_window = |