mash: Do not show avatar on browser frame

chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.h"
 
 #include <algorithm>
 
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/themes/theme_properties.h"
@@ skipping 350 matching lines @@
 // BrowserNonClientFrameViewMus, protected:
 
 // BrowserNonClientFrameView:
 void BrowserNonClientFrameViewMus::UpdateProfileIcons() {
 #if defined(FRAME_AVATAR_BUTTON)
   if (browser_view()->IsRegularOrGuestSession()) {
     profile_switcher_.Update(AvatarButtonStyle::NATIVE);
     return;
   }
 #endif
+  Browser* browser = browser_view()->browser();
+
+  // Similar logic as in BrowserNonClientFrameViewAsh::UpdateProfileIcons (minus
+  // the multi-profile part). That is, no profile indicator for non-tabbed and
+  // non-app browser window, or regular/guest user browser window.
+  if (!browser->is_type_tabbed() && !browser->is_app())
+    return;
+  if (browser_view()->IsRegularOrGuestSession())
+    return;
+
   UpdateProfileIndicatorIcon();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserNonClientFrameViewMus, private:
 
 void BrowserNonClientFrameViewMus::TabStripMaxXChanged(TabStrip* tab_strip) {
   UpdateClientArea();
 }
 
@@ skipping 126 matching lines @@
   // TODO: move ash_layout_constants to ash/public/cpp.
   const bool restored = !frame()->IsMaximized() && !frame()->IsFullscreen();
   return GetAshLayoutSize(restored
                               ? AshLayoutSize::BROWSER_RESTORED_CAPTION_BUTTON
                               : AshLayoutSize::BROWSER_MAXIMIZED_CAPTION_BUTTON)
       .height();
 #else
   return views::WindowManagerFrameValues::instance().normal_insets.top();
 #endif
 }