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

Unified Diff: ash/system/cast/tray_cast.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/cast/tray_cast.h ('k') | ash/system/chromeos/network/tray_network.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/cast/tray_cast.cc
diff --git a/ash/system/cast/tray_cast.cc b/ash/system/cast/tray_cast.cc
index fbbc8b5152a910239d80d3a2f13ca42a0d3a2d7f..102c864c245730fc8d6dd76a37ea65c778e9b1b5 100644
--- a/ash/system/cast/tray_cast.cc
+++ b/ash/system/cast/tray_cast.cc
@@ -338,7 +338,7 @@ class CastTrayView : public TrayItemView {
// Called when the tray alignment changes so that the icon can recenter
// itself.
- void UpdateAlignment(ShelfAlignment alignment);
+ void UpdateAlignment(wm::ShelfAlignment alignment);
private:
DISALLOW_COPY_AND_ASSIGN(CastTrayView);
@@ -356,7 +356,7 @@ CastTrayView::CastTrayView(SystemTrayItem* tray_item)
CastTrayView::~CastTrayView() {
}
-void CastTrayView::UpdateAlignment(ShelfAlignment alignment) {
+void CastTrayView::UpdateAlignment(wm::ShelfAlignment alignment) {
// Center the item dependent on the orientation of the shelf.
views::BoxLayout::Orientation layout = IsHorizontalAlignment(alignment)
? views::BoxLayout::kVertical
@@ -673,7 +673,7 @@ void TrayCast::OnCastingSessionStartedOrStopped(bool started) {
UpdatePrimaryView();
}
-void TrayCast::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
+void TrayCast::UpdateAfterShelfAlignmentChange(wm::ShelfAlignment alignment) {
if (tray_)
tray_->UpdateAlignment(alignment);
}
« no previous file with comments | « ash/system/cast/tray_cast.h ('k') | ash/system/chromeos/network/tray_network.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698