| Index: ash/system/user/user_view.cc
|
| diff --git a/ash/system/user/user_view.cc b/ash/system/user/user_view.cc
|
| index 6e4a7269865f7644fa18c6fed45489635672ad15..6ca3e9b71460e19ac67af7d9331cf4aeeb3810d0 100644
|
| --- a/ash/system/user/user_view.cc
|
| +++ b/ash/system/user/user_view.cc
|
| @@ -89,18 +89,12 @@ class LogoutButton : public TrayPopupLabelButton {
|
| const base::string16& text,
|
| bool placeholder)
|
| : TrayPopupLabelButton(listener, text), placeholder_(placeholder) {
|
| - SetEnabled(!placeholder_);
|
| + SetVisible(!placeholder_);
|
| }
|
|
|
| ~LogoutButton() override {}
|
|
|
| private:
|
| - void Paint(gfx::Canvas* canvas, const views::CullSet& cull_set) override {
|
| - // Just skip paint if this button used as a placeholder.
|
| - if (!placeholder_)
|
| - TrayPopupLabelButton::Paint(canvas, cull_set);
|
| - }
|
| -
|
| bool placeholder_;
|
| DISALLOW_COPY_AND_ASSIGN(LogoutButton);
|
| };
|
|
|