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

Unified Diff: ash/wm/shelf_layout_manager.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
Index: ash/wm/shelf_layout_manager.cc
diff --git a/ash/wm/shelf_layout_manager.cc b/ash/wm/shelf_layout_manager.cc
index 46023ccb3abe65758c96947a0196fc13f4deaae8..c86272244790551774e5d1594e56d66b9e3cfd34 100644
--- a/ash/wm/shelf_layout_manager.cc
+++ b/ash/wm/shelf_layout_manager.cc
@@ -495,18 +495,7 @@ void ShelfLayoutManager::OnWindowActivated(aura::Window* active,
ShelfLayoutManager::TargetBounds::TargetBounds() : opacity(0.0f) {}
-gfx::Rect ShelfLayoutManager::GetMaximizedWindowBounds(
- aura::Window* window) {
- gfx::Rect bounds(ScreenAsh::GetDisplayBoundsInParent(window));
- if (auto_hide_behavior_ == SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS) {
- AdjustBoundsBasedOnAlignment(kAutoHideSize, &bounds);
- return bounds;
- }
- // SHELF_AUTO_HIDE_BEHAVIOR_NEVER maximized windows don't get any taller.
- return GetUnmaximizedWorkAreaBounds(window);
-}
-
-gfx::Rect ShelfLayoutManager::GetUnmaximizedWorkAreaBounds(
+gfx::Rect ShelfLayoutManager::GetWorkAreaBounds(
aura::Window* window) {
gfx::Rect bounds(ScreenAsh::GetDisplayBoundsInParent(window));
int size;

Powered by Google App Engine
This is Rietveld 408576698