Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(755)

Unified Diff: ash/wm/window_resizer.cc

Issue 138003007: [Cleanup] Screen cleanup (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: make sure screen_for_shutdown is reset everytime Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/window_positioner.cc ('k') | ash/wm/window_state.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/window_resizer.cc
diff --git a/ash/wm/window_resizer.cc b/ash/wm/window_resizer.cc
index 2631cc6eb9a9d963504c95c227ad26722484e11c..5569646fb1f9bff18e15f5edd1b2770cb84af01b 100644
--- a/ash/wm/window_resizer.cc
+++ b/ash/wm/window_resizer.cc
@@ -4,7 +4,7 @@
#include "ash/wm/window_resizer.h"
-#include "ash/screen_ash.h"
+#include "ash/screen_util.h"
#include "ash/shell.h"
#include "ash/shell_window_ids.h"
#include "ash/wm/coordinate_conversion.h"
@@ -149,7 +149,7 @@ gfx::Rect WindowResizer::CalculateBoundsForDrag(
dock_container->layout_manager());
work_area.Union(dock_layout->docked_bounds());
- work_area = ScreenAsh::ConvertRectFromScreen(GetTarget()->parent(),
+ work_area = ScreenUtil::ConvertRectFromScreen(GetTarget()->parent(),
work_area);
if (details().size_change_direction & kBoundsChangeDirection_Horizontal) {
if (IsRightEdge(details().window_component) &&
@@ -222,7 +222,7 @@ gfx::Rect WindowResizer::CalculateBoundsForDrag(
screen_work_area.Union(dock_layout->docked_bounds());
screen_work_area.Inset(kMinimumOnScreenArea, 0);
gfx::Rect new_bounds_in_screen =
- ScreenAsh::ConvertRectToScreen(parent, new_bounds);
+ ScreenUtil::ConvertRectToScreen(parent, new_bounds);
if (!screen_work_area.Intersects(new_bounds_in_screen)) {
// Make sure that the x origin does not leave the current display.
new_bounds_in_screen.set_x(
@@ -230,7 +230,7 @@ gfx::Rect WindowResizer::CalculateBoundsForDrag(
std::min(screen_work_area.right(),
new_bounds_in_screen.x())));
new_bounds =
- ScreenAsh::ConvertRectFromScreen(parent, new_bounds_in_screen);
+ ScreenUtil::ConvertRectFromScreen(parent, new_bounds_in_screen);
}
}
« no previous file with comments | « ash/wm/window_positioner.cc ('k') | ash/wm/window_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698