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

Unified Diff: ash/shelf/shelf_layout_manager.cc

Issue 22793011: ash:Shelf - Enable Alternate Shelf and Side Shelf by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 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 | « ash/screen_ash_unittest.cc ('k') | ash/shelf/shelf_layout_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_layout_manager.cc
diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc
index a507da648a839e58de1b06987e4e344ea9226e16..9d3b52ef14ea56e08cb9acb0e445d1c08b0ef530 100644
--- a/ash/shelf/shelf_layout_manager.cc
+++ b/ash/shelf/shelf_layout_manager.cc
@@ -892,10 +892,10 @@ void ShelfLayoutManager::UpdateTargetBoundsForGesture(
if (ash::switches::UseAlternateShelfLayout()) {
if (alignment_ == SHELF_ALIGNMENT_RIGHT) {
- target_bounds->shelf_bounds_in_root.set_x(
- available_bounds.right() - shelf_width + kStatusAreaInset);
+ target_bounds->status_bounds_in_shelf.set_x(kStatusAreaInset);
} else {
- target_bounds->shelf_bounds_in_root.set_x(kStatusAreaInset);
+ target_bounds->status_bounds_in_shelf.set_x(
+ available_bounds.right() - shelf_width + kStatusAreaInset);
}
} else {
// The statusbar should be in the center of the shelf.
« no previous file with comments | « ash/screen_ash_unittest.cc ('k') | ash/shelf/shelf_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698