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

Unified Diff: ash/system/date/tray_date.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
Index: ash/system/date/tray_date.cc
diff --git a/ash/system/date/tray_date.cc b/ash/system/date/tray_date.cc
index 8a574fed736a125d642adb023d7d7396a2ea511c..7d9e4c39e29e33dd2762dbbfeeb0e90449c19f99 100644
--- a/ash/system/date/tray_date.cc
+++ b/ash/system/date/tray_date.cc
@@ -53,9 +53,9 @@ views::View* TrayDate::CreateDefaultViewForTesting(user::LoginStatus status) {
views::View* TrayDate::CreateTrayView(user::LoginStatus status) {
CHECK(time_tray_ == NULL);
ClockLayout clock_layout =
- (system_tray()->shelf_alignment() == SHELF_ALIGNMENT_BOTTOM ||
- system_tray()->shelf_alignment() == SHELF_ALIGNMENT_TOP) ?
- HORIZONTAL_CLOCK : VERTICAL_CLOCK;
+ system_tray()->shelf_alignment() == SHELF_ALIGNMENT_BOTTOM
+ ? HORIZONTAL_CLOCK
+ : VERTICAL_CLOCK;
time_tray_ = new tray::TimeView(clock_layout);
views::View* view = new TrayItemView(this);
view->AddChildView(time_tray_);
@@ -94,9 +94,8 @@ void TrayDate::UpdateAfterLoginStatusChange(user::LoginStatus status) {
void TrayDate::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
if (time_tray_) {
- ClockLayout clock_layout = (alignment == SHELF_ALIGNMENT_BOTTOM ||
- alignment == SHELF_ALIGNMENT_TOP) ?
- HORIZONTAL_CLOCK : VERTICAL_CLOCK;
+ ClockLayout clock_layout =
+ alignment == SHELF_ALIGNMENT_BOTTOM ? HORIZONTAL_CLOCK : VERTICAL_CLOCK;
time_tray_->UpdateClockLayout(clock_layout);
}
}
« no previous file with comments | « ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc ('k') | ash/system/overview/overview_button_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698