Re-enable runtime badging of browser windows.

This CL fixes an issue with the profile icon not showing up if the user
has pinned the default chrome shortcut to the taskbar.

Using the runtime badging on top of the taskbar icon's badge causes the badge to look slightly darker around the edges at runtime.

BUG=313800

Review URL: https://codereview.chromium.org/54053008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233433 0039d316-1c4b-4281-b951-d872f2087c98

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

@@ -115,15 +115,16 @@ void BrowserNonClientFrameView::UpdateAvatarInfo() {
   }
 
   // For popups and panels which don't have the avatar button, we still
-  // need to draw the taskbar decoration. Draw the avatar for
-  // custom-user-data-dir windows which don't support having a shortcut icon.
-  // For non-custom-user-data-dir windows, the window's relaunch details are set
-  // so that the profile's shortcut icon is used, which includes this badge.
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUserDataDir)) {
-    chrome::DrawTaskbarDecoration(
-        frame_->GetNativeWindow(),
-        AvatarMenu::ShouldShowAvatarMenu() ? &avatar : NULL);
-  }
+  // need to draw the taskbar decoration. Even though we have an icon on the
+  // window's relaunch details, we draw over it because the user may have pinned
+  // the badge-less Chrome shortcut which will cause windows to ignore the
+  // relaunch details.
+  // TODO(calamity): ideally this should not be necessary but due to issues with
+  // the default shortcut being pinned, we add the runtime badge for safety.
+  // See crbug.com/313800.
+  chrome::DrawTaskbarDecoration(
+      frame_->GetNativeWindow(),
+      AvatarMenu::ShouldShowAvatarMenu() ? &avatar : NULL);
 }
 
 void BrowserNonClientFrameView::UpdateNewStyleAvatarInfo(