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

Unified Diff: ash/wm/workspace/workspace_window_resizer.cc

Issue 10795013: Rename bounds accessors to be intuitive and consistent (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 5 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
Index: ash/wm/workspace/workspace_window_resizer.cc
diff --git a/ash/wm/workspace/workspace_window_resizer.cc b/ash/wm/workspace/workspace_window_resizer.cc
index 455afdd0dbc6bf6be2b2716912e043ca6044343c..0c998cb79cbceb7d47d0adbc8b29fd9381d977c8 100644
--- a/ash/wm/workspace/workspace_window_resizer.cc
+++ b/ash/wm/workspace/workspace_window_resizer.cc
@@ -281,7 +281,7 @@ void WorkspaceWindowResizer::AdjustBoundsForMainWindow(
gfx::Rect* bounds, int grid_size) const {
// Always keep kMinOnscreenHeight on the bottom.
gfx::Rect work_area(
- ScreenAsh::GetDisplayWorkAreaParentBounds(details_.window));
+ ScreenAsh::GetDisplayWorkAreaBoundsInParent(details_.window));
int max_y = AlignToGridRoundUp(work_area.bottom() - kMinOnscreenHeight,
grid_size);
if (bounds->y() > max_y)
@@ -335,7 +335,7 @@ void WorkspaceWindowResizer::SnapToWorkAreaEdges(
bool WorkspaceWindowResizer::TouchesBottomOfScreen() const {
gfx::Rect work_area(
- ScreenAsh::GetDisplayWorkAreaParentBounds(details_.window));
+ ScreenAsh::GetDisplayWorkAreaBoundsInParent(details_.window));
return (attached_windows_.empty() &&
details_.window->bounds().bottom() == work_area.bottom()) ||
(!attached_windows_.empty() &&
@@ -423,7 +423,7 @@ WorkspaceWindowResizer::SnapType WorkspaceWindowResizer::GetSnapType(
const gfx::Point& location) const {
// TODO: this likely only wants total display area, not the area of a single
// display.
- gfx::Rect area(ScreenAsh::GetDisplayParentBounds(details_.window));
+ gfx::Rect area(ScreenAsh::GetDisplayBoundsInParent(details_.window));
if (location.x() <= area.x())
return SNAP_LEFT_EDGE;
if (location.x() >= area.right() - 1)
« no previous file with comments | « ash/wm/workspace/workspace_manager_unittest.cc ('k') | ash/wm/workspace/workspace_window_resizer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698