diff options
| author | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-31 02:03:28 +0000 |
|---|---|---|
| committer | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-31 02:03:28 +0000 |
| commit | 630f1490db3086e0661e24562b9a55d89a62ff86 (patch) | |
| tree | afae59ef2e0a9df68c11a010c8a67d56392db355 | |
| parent | 169e4f21c7799e81bcff1b476e894409450ad2ce (diff) | |
| download | chromium_src-630f1490db3086e0661e24562b9a55d89a62ff86.zip chromium_src-630f1490db3086e0661e24562b9a55d89a62ff86.tar.gz chromium_src-630f1490db3086e0661e24562b9a55d89a62ff86.tar.bz2 | |
Disable task bar badge for single profile case
BUG=106995
TEST=
Review URL: http://codereview.chromium.org/9264055
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119815 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/views/avatar_menu_button.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/ui/views/avatar_menu_button.cc b/chrome/browser/ui/views/avatar_menu_button.cc index f792e7c..a89228f 100644 --- a/chrome/browser/ui/views/avatar_menu_button.cc +++ b/chrome/browser/ui/views/avatar_menu_button.cc @@ -1,9 +1,10 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// 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/avatar_menu_button.h" +#include "chrome/browser/profiles/avatar_menu_model.h" #include "chrome/browser/profiles/profile_metrics.h" #include "chrome/browser/profiles/profile_info_util.h" #include "chrome/browser/ui/browser.h" @@ -36,6 +37,10 @@ void DrawTaskBarDecoration(gfx::NativeWindow window, const gfx::Image* image) { #if defined(OS_WIN) && !defined(USE_AURA) if (base::win::GetVersion() < base::win::VERSION_WIN7) return; + // Don't badge the task bar in the single profile case to match the behavior + // of the title bar. + if (!AvatarMenuModel::ShouldShowAvatarMenu()) + return; // SetOverlayIcon does nothing if the window is not visible so testing // here avoids all the wasted effort of the image resizing. if (!::IsWindowVisible(window)) |