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

Unified Diff: ash/screen_ash.cc

Issue 10979090: Simplify WorkAreaBounds access logic (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Comment Updated Created 8 years, 3 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 | « no previous file | ash/wm/shelf_layout_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/screen_ash.cc
diff --git a/ash/screen_ash.cc b/ash/screen_ash.cc
index efda02240d0849c533e6c4044d836a50d6bbb515..87bb461f99aa55c4e8fb647fd5add9e82a63dd48 100644
--- a/ash/screen_ash.cc
+++ b/ash/screen_ash.cc
@@ -40,7 +40,7 @@ gfx::Display ScreenAsh::FindDisplayContainingPoint(const gfx::Point& point) {
// static
gfx::Rect ScreenAsh::GetMaximizedWindowBoundsInParent(aura::Window* window) {
sky 2012/10/01 14:11:48 Can't you nuke this entirely and folks instead use
if (window->GetRootWindow() == Shell::GetPrimaryRootWindow())
- return Shell::GetInstance()->shelf()->GetMaximizedWindowBounds(window);
+ return Shell::GetInstance()->shelf()->GetWorkAreaBounds(window);
else
return GetDisplayBoundsInParent(window);
}
@@ -49,7 +49,7 @@ gfx::Rect ScreenAsh::GetMaximizedWindowBoundsInParent(aura::Window* window) {
gfx::Rect ScreenAsh::GetUnmaximizedWorkAreaBoundsInParent(
aura::Window* window) {
if (window->GetRootWindow() == Shell::GetPrimaryRootWindow())
- return Shell::GetInstance()->shelf()->GetUnmaximizedWorkAreaBounds(window);
+ return Shell::GetInstance()->shelf()->GetWorkAreaBounds(window);
else
return GetDisplayWorkAreaBoundsInParent(window);
}
« no previous file with comments | « no previous file | ash/wm/shelf_layout_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698