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

Unified Diff: ash/system/date/tray_date.cc

Issue 1914093002: Refactors DockedWindowLayoutManager in terms of ash/wm/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@nuke_aura_window
Patch Set: comment 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/system/date/tray_date.h ('k') | ash/system/ime/tray_ime_chromeos.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/date/tray_date.cc
diff --git a/ash/system/date/tray_date.cc b/ash/system/date/tray_date.cc
index dc0ace711f71303b1641f1c7e378c891a9fda013..052a1aed582e41780aa05f9badbac15fbb4da2cb 100644
--- a/ash/system/date/tray_date.cc
+++ b/ash/system/date/tray_date.cc
@@ -54,7 +54,7 @@ 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() == wm::SHELF_ALIGNMENT_BOTTOM
? HORIZONTAL_CLOCK
: VERTICAL_CLOCK;
time_tray_ = new tray::TimeView(clock_layout);
@@ -93,7 +93,7 @@ void TrayDate::DestroyDetailedView() {
void TrayDate::UpdateAfterLoginStatusChange(user::LoginStatus status) {
}
-void TrayDate::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
+void TrayDate::UpdateAfterShelfAlignmentChange(wm::ShelfAlignment alignment) {
if (time_tray_) {
ClockLayout clock_layout =
IsHorizontalAlignment(alignment) ? HORIZONTAL_CLOCK : VERTICAL_CLOCK;
« no previous file with comments | « ash/system/date/tray_date.h ('k') | ash/system/ime/tray_ime_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698