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

Unified Diff: chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc

Issue 895803003: [Profiles] Remove the NotificationService from the ProfileInfoCache (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clean up views code Created 5 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
Index: chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
index 98d7efff722c49289fe818aa2fd41f359bf43a2a..d35dfa131217beef5d486b8245fa7e6d39309e3c 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
@@ -126,12 +126,7 @@ void BrowserNonClientFrameViewAsh::Init() {
window_icon_->Update();
}
- if (browser_view()->IsRegularOrGuestSession() &&
- switches::IsNewAvatarMenu()) {
- UpdateNewStyleAvatarInfo(this, NewAvatarButton::NATIVE_BUTTON);
- } else {
- UpdateAvatarInfo();
- }
+ UpdateAvatar();
// HeaderPainter handles layout.
if (UsePackagedAppHeaderStyle()) {
@@ -222,6 +217,10 @@ views::View* BrowserNonClientFrameViewAsh::GetLocationIconView() const {
return nullptr;
}
+void BrowserNonClientFrameViewAsh::UpdateNewStyleAvatar() {
+ UpdateNewStyleAvatarInfo(this, NewAvatarButton::NATIVE_BUTTON);
+}
+
///////////////////////////////////////////////////////////////////////////////
// views::NonClientFrameView:

Powered by Google App Engine
This is Rietveld 408576698