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

Unified Diff: ash/common/system/user/tray_user.cc

Issue 2678353005: Remove pre-MD code related to tray/menu user profiles. (Closed)
Patch Set: back out a11y changes and rebase Created 3 years, 10 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/common/system/user/rounded_image_view.cc ('k') | ash/common/system/user/tray_user_separator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/user/tray_user.cc
diff --git a/ash/common/system/user/tray_user.cc b/ash/common/system/user/tray_user.cc
index c4d5c9861eb3fc9d2eed3d14f571762239090d35..a6c07eb936d1baaae9f2935f84ecfaaabf8daf0b 100644
--- a/ash/common/system/user/tray_user.cc
+++ b/ash/common/system/user/tray_user.cc
@@ -4,7 +4,6 @@
#include "ash/common/system/user/tray_user.h"
-#include "ash/common/material_design/material_design_controller.h"
#include "ash/common/session/session_state_delegate.h"
#include "ash/common/shelf/wm_shelf_util.h"
#include "ash/common/system/tray/system_tray.h"
@@ -156,11 +155,9 @@ void TrayUser::UpdateAfterLoginStatusChange(LoginStatus status) {
label_ = nullptr;
}
if (need_avatar) {
- avatar_ = new tray::RoundedImageView(kTrayRoundedBorderRadius, true);
- if (MaterialDesignController::IsShelfMaterial()) {
- avatar_->SetPaintToLayer();
- avatar_->layer()->SetFillsBoundsOpaquely(false);
- }
+ avatar_ = new tray::RoundedImageView(kTrayRoundedBorderRadius);
+ avatar_->SetPaintToLayer();
+ avatar_->layer()->SetFillsBoundsOpaquely(false);
layout_view_->AddChildView(avatar_);
} else {
avatar_ = nullptr;
« no previous file with comments | « ash/common/system/user/rounded_image_view.cc ('k') | ash/common/system/user/tray_user_separator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698