Re-enable runtime badging of browser windows.

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

 // Copyright (c) 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.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/avatar_menu.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 98 matching lines @@
     if (avatar_button_ && !AvatarMenu::ShouldShowAvatarMenu())
       avatar_button_->SetEnabled(false);
   }
   if (avatar_button_) {
     avatar_button_->SetAvatarIcon(avatar, is_rectangle);
     if (!text.empty())
       avatar_button_->SetText(text);
   }
 
   // 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(
     views::ButtonListener* listener,
     const NewAvatarButton::AvatarButtonStyle style) {
   DCHECK(profiles::IsNewProfileManagementEnabled());
   // This should never be called in incognito mode.
   DCHECK(browser_view_->IsRegularOrGuestSession());
 
   if (browser_view_->ShouldShowAvatar()) {
@@ skipping 16 matching lines @@
 void BrowserNonClientFrameView::ShowProfileChooserViewBubble() {
   gfx::Point origin;
   views::View::ConvertPointToScreen(new_avatar_button(), &origin);
   gfx::Rect bounds(origin, size());
 
   ProfileChooserView::ShowBubble(
       new_avatar_button(), views::BubbleBorder::TOP_RIGHT,
       views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE, bounds,
       browser_view_->browser());
 }