Incognito icon shows up again when opening incognito browser.

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

 // Copyright 2012 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_ash.h"
 
 #include <algorithm>
 
 #include "ash/ash_layout_constants.h"
 #include "ash/common/material_design/material_design_controller.h"
@@ skipping 379 matching lines @@
   views::WidgetDelegate* delegate = frame()->widget_delegate();
   return delegate ? delegate->GetWindowIcon() : gfx::ImageSkia();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserNonClientFrameViewAsh, protected:
 
 // BrowserNonClientFrameView:
 void BrowserNonClientFrameViewAsh::UpdateProfileIcons() {
   Browser* browser = browser_view()->browser();
-  if ((browser->is_type_tabbed() || browser->is_app()) &&
-      chrome::MultiUserWindowManager::ShouldShowAvatar(
-          browser_view()->GetNativeWindow())) {
+  const Profile* profile = browser_view()->browser()->profile();

[jdufault, 2016/06/10 16:43:23]

nit: This can be shortened to browser->profile()

+  bool show_avatar = (browser->is_type_tabbed() || browser->is_app()) &&
+                     chrome::MultiUserWindowManager::ShouldShowAvatar(
+                         browser_view()->GetNativeWindow());
+  bool is_incognito = profile->GetProfileType() == Profile::INCOGNITO_PROFILE;

[Peter Kasting, 2016/06/11 01:54:46]

The incognito case can only apply when the (tabbed || app) check succeeds.

So I might write this as:

  Browser* browser = browser_view()->browser();
  if (!browser_->is_type_tabbed() && !browser_->is_app())
    return;
  if ((browser->profile()->GetProfileType() == Profile::INCOGNITO_PROFILE) ||
      chrome::MultiUserWindowManager::ShouldShowAvatar(
          browser_view()->GetNativeWindow()))
    UpdateProfileIndicatorIcon();

+  if (show_avatar || is_incognito) {
     UpdateProfileIndicatorIcon();
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserNonClientFrameViewAsh, private:
 
 // views::NonClientFrameView:
 bool BrowserNonClientFrameViewAsh::DoesIntersectRect(
     const views::View* target,
@@ skipping 170 matching lines @@
     // TODO(pkasting): The "2 *" part of this makes no sense to me.
     canvas->TileImageInt(*right, 0, 0, w - (2 * kClientEdgeThickness) - img_w,
                          img_y, img_w, img_h);
 
     // Toolbar/content separator.
     toolbar_bounds.Inset(kClientEdgeThickness, h - kClientEdgeThickness,
                          kClientEdgeThickness, 0);
     canvas->FillRect(toolbar_bounds, separator_color);
   }
 }