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

Unified Diff: ash/shelf/shelf_button.cc

Issue 1849623002: Remove unused ash::SHELF_ALIGNMENT_TOP (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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/shelf/shelf_bezel_event_filter.cc ('k') | ash/shelf/shelf_layout_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_button.cc
diff --git a/ash/shelf/shelf_button.cc b/ash/shelf/shelf_button.cc
index ff7b1390f8b8a1319747fe9202c680c14180227b..7a805bd99388f9bac7de93d1392259e550d27104 100644
--- a/ash/shelf/shelf_button.cc
+++ b/ash/shelf/shelf_button.cc
@@ -377,9 +377,6 @@ void ShelfButton::Layout() {
if (SHELF_ALIGNMENT_LEFT == shelf->alignment())
x_offset = button_bounds.width() - (kIconSize + icon_pad);
- if (SHELF_ALIGNMENT_TOP == shelf->alignment())
- y_offset = button_bounds.height() - (kIconSize + icon_pad);
-
// Center icon with respect to the secondary axis, and ensure
// that the icon doesn't occlude the bar highlight.
if (shelf->IsHorizontalAlignment()) {
@@ -499,15 +496,14 @@ void ShelfButton::UpdateBar() {
*image, shelf->SelectValueForShelfAlignment(
SkBitmapOperations::ROTATION_90_CW,
SkBitmapOperations::ROTATION_90_CW,
- SkBitmapOperations::ROTATION_270_CW,
- SkBitmapOperations::ROTATION_180_CW)));
+ SkBitmapOperations::ROTATION_270_CW)));
}
bar_->SetHorizontalAlignment(shelf->SelectValueForShelfAlignment(
views::ImageView::CENTER, views::ImageView::LEADING,
- views::ImageView::TRAILING, views::ImageView::CENTER));
+ views::ImageView::TRAILING));
bar_->SetVerticalAlignment(shelf->SelectValueForShelfAlignment(
views::ImageView::TRAILING, views::ImageView::CENTER,
- views::ImageView::CENTER, views::ImageView::LEADING));
+ views::ImageView::CENTER));
bar_->SchedulePaint();
}
« no previous file with comments | « ash/shelf/shelf_bezel_event_filter.cc ('k') | ash/shelf/shelf_layout_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698