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

Unified Diff: ash/system/chromeos/network/tray_network.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/chromeos/network/tray_network.h ('k') | ash/system/chromeos/network/tray_vpn.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/chromeos/network/tray_network.cc
diff --git a/ash/system/chromeos/network/tray_network.cc b/ash/system/chromeos/network/tray_network.cc
index 5bc9c8f36977debd65ceb2ad686011a9c9fee6a0..eeb86d5adee46faf66c511c5bd16e3bd129ff852 100644
--- a/ash/system/chromeos/network/tray_network.cc
+++ b/ash/system/chromeos/network/tray_network.cc
@@ -91,7 +91,7 @@ class NetworkTrayView : public TrayItemView,
}
}
- void UpdateAlignment(ShelfAlignment alignment) {
+ void UpdateAlignment(wm::ShelfAlignment alignment) {
SetLayoutManager(new views::BoxLayout(IsHorizontalAlignment(alignment)
? views::BoxLayout::kHorizontal
: views::BoxLayout::kVertical,
@@ -303,7 +303,8 @@ void TrayNetwork::DestroyDetailedView() {
void TrayNetwork::UpdateAfterLoginStatusChange(user::LoginStatus status) {
}
-void TrayNetwork::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
+void TrayNetwork::UpdateAfterShelfAlignmentChange(
+ wm::ShelfAlignment alignment) {
if (tray_) {
SetTrayImageItemBorder(tray_, alignment);
tray_->UpdateAlignment(alignment);
« no previous file with comments | « ash/system/chromeos/network/tray_network.h ('k') | ash/system/chromeos/network/tray_vpn.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698