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

Unified Diff: ash/system/session/logout_button_tray.h

Issue 2899253002: chromeos: Rename ash::WmShelf to Shelf (Closed)
Patch Set: cleanup Created 3 years, 7 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/session/logout_button_tray.h
diff --git a/ash/system/session/logout_button_tray.h b/ash/system/session/logout_button_tray.h
index 0e4b26e75a077996128bfdde26307139cdfcb3fd..6b2eccaaa7e5fc4e356bd943e9d4c9f34ea0eafe 100644
--- a/ash/system/session/logout_button_tray.h
+++ b/ash/system/session/logout_button_tray.h
@@ -17,8 +17,8 @@ class MdTextButton;
}
namespace ash {
+class Shelf;
class TrayContainer;
-class WmShelf;
// Adds a logout button to the launcher's status area if enabled by the
// kShowLogoutButtonInTray pref.
@@ -26,7 +26,7 @@ class ASH_EXPORT LogoutButtonTray : public views::View,
public LogoutButtonObserver,
public views::ButtonListener {
public:
- explicit LogoutButtonTray(WmShelf* wm_shelf);
+ explicit LogoutButtonTray(Shelf* shelf);
~LogoutButtonTray() override;
void UpdateAfterLoginStatusChange();
@@ -46,7 +46,7 @@ class ASH_EXPORT LogoutButtonTray : public views::View,
void UpdateVisibility();
void UpdateButtonTextAndImage();
- WmShelf* const wm_shelf_;
+ Shelf* const shelf_;
TrayContainer* const container_;
views::MdTextButton* const button_;
bool show_logout_button_in_tray_;

Powered by Google App Engine
This is Rietveld 408576698