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

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

Issue 2807693002: Make LogoutButtonTray a regular View (Closed)
Patch Set: Rebased Created 3 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_system_info.h ('k') | ash/system/ime_menu/ime_menu_tray.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/date/tray_system_info.cc
diff --git a/ash/system/date/tray_system_info.cc b/ash/system/date/tray_system_info.cc
index 5014f9f72e9851bfab0fbaf0f8b340d088a78cbd..face74957621373d31e52b4bdfae943df114c316 100644
--- a/ash/system/date/tray_system_info.cc
+++ b/ash/system/date/tray_system_info.cc
@@ -4,7 +4,7 @@
#include "ash/system/date/tray_system_info.h"
-#include "ash/shelf/wm_shelf_util.h"
+#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
#include "ash/system/date/date_view.h"
#include "ash/system/date/system_info_default_view.h"
@@ -43,7 +43,7 @@ views::View* TraySystemInfo::CreateDefaultViewForTesting(LoginStatus status) {
views::View* TraySystemInfo::CreateTrayView(LoginStatus status) {
CHECK(tray_view_ == nullptr);
tray::TimeView::ClockLayout clock_layout =
- IsHorizontalAlignment(system_tray()->shelf_alignment())
+ system_tray()->shelf()->IsHorizontalAlignment()
? tray::TimeView::ClockLayout::HORIZONTAL_CLOCK
: tray::TimeView::ClockLayout::VERTICAL_CLOCK;
tray_view_ = new tray::TimeView(clock_layout);
@@ -70,10 +70,10 @@ void TraySystemInfo::DestroyDefaultView() {
default_view_ = nullptr;
}
-void TraySystemInfo::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
+void TraySystemInfo::UpdateAfterShelfAlignmentChange() {
if (tray_view_) {
tray::TimeView::ClockLayout clock_layout =
- IsHorizontalAlignment(alignment)
+ system_tray()->shelf()->IsHorizontalAlignment()
? tray::TimeView::ClockLayout::HORIZONTAL_CLOCK
: tray::TimeView::ClockLayout::VERTICAL_CLOCK;
tray_view_->UpdateClockLayout(clock_layout);
« no previous file with comments | « ash/system/date/tray_system_info.h ('k') | ash/system/ime_menu/ime_menu_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698