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

Unified Diff: ash/system/chromeos/screen_security/screen_tray_item.h

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: merge 2 trunk 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/chromeos/screen_security/screen_tray_item.h
diff --git a/ash/system/chromeos/screen_security/screen_tray_item.h b/ash/system/chromeos/screen_security/screen_tray_item.h
index 6e48357a55dd7525a7e6cd2c2e6ac201a635b0b0..83d808010863ecd8d5a33234f7c77e86e8d47080 100644
--- a/ash/system/chromeos/screen_security/screen_tray_item.h
+++ b/ash/system/chromeos/screen_security/screen_tray_item.h
@@ -123,7 +123,7 @@ class ASH_EXPORT ScreenTrayItem : public SystemTrayItem {
views::View* CreateDefaultView(user::LoginStatus status) override = 0;
void DestroyTrayView() override;
void DestroyDefaultView() override;
- void UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) override;
+ void UpdateAfterShelfAlignmentChange(wm::ShelfAlignment alignment) override;
private:
tray::ScreenTrayView* tray_view_;

Powered by Google App Engine
This is Rietveld 408576698