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

Unified Diff: ui/aura_shell/desktop_layout_manager.cc

Issue 8369007: Changes launcher animations to fade before moving. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Tweaks Created 9 years, 2 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 | ui/aura_shell/launcher/launcher_view.h » ('j') | ui/aura_shell/launcher/launcher_view.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura_shell/desktop_layout_manager.cc
diff --git a/ui/aura_shell/desktop_layout_manager.cc b/ui/aura_shell/desktop_layout_manager.cc
index a638b3b1155302c782e2f3e86e760fbe20c50c18..39558704196381a239d828b8265d666dbf7cfa6a 100644
--- a/ui/aura_shell/desktop_layout_manager.cc
+++ b/ui/aura_shell/desktop_layout_manager.cc
@@ -36,18 +36,19 @@ void DesktopLayoutManager::OnWindowResized() {
background_widget_->SetBounds(fullscreen_bounds);
- gfx::Rect launcher_bounds = launcher_widget_->GetWindowScreenBounds();
- launcher_widget_->SetBounds(
- gfx::Rect(0, owner_->bounds().bottom() - launcher_bounds.height(),
- launcher_bounds.width(),
- launcher_bounds.height()));
-
gfx::Rect status_area_bounds = status_area_widget_->GetWindowScreenBounds();
status_area_widget_->SetBounds(
gfx::Rect(owner_->bounds().right() - status_area_bounds.width(),
owner_->bounds().bottom() - status_area_bounds.height(),
status_area_bounds.width(),
status_area_bounds.height()));
+
+ // Give the launcher the available width minus the status area.
+ gfx::Rect launcher_bounds = launcher_widget_->GetWindowScreenBounds();
+ launcher_widget_->SetBounds(
+ gfx::Rect(0, owner_->bounds().bottom() - launcher_bounds.height(),
+ owner_->bounds().width() - status_area_bounds.width(),
+ launcher_bounds.height()));
}
} // namespace internal
« no previous file with comments | « no previous file | ui/aura_shell/launcher/launcher_view.h » ('j') | ui/aura_shell/launcher/launcher_view.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698