Chromium Code Reviews| Index: chrome/browser/ui/views/frame/browser_view.cc |
| diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc |
| index ee91a9ea5ae53052f35b3ced4af58bf9b7e256de..34098ed915a0792e93fc6b54dd44fa61410d5864 100644 |
| --- a/chrome/browser/ui/views/frame/browser_view.cc |
| +++ b/chrome/browser/ui/views/frame/browser_view.cc |
| @@ -24,6 +24,7 @@ |
| #include "chrome/browser/instant/instant_controller.h" |
| #include "chrome/browser/native_window_notification_source.h" |
| #include "chrome/browser/ntp_background_util.h" |
| +#include "chrome/browser/managed_mode.h" |
| #include "chrome/browser/prefs/pref_service.h" |
| #include "chrome/browser/profiles/avatar_menu_model.h" |
| #include "chrome/browser/profiles/profile.h" |
| @@ -468,6 +469,8 @@ bool BrowserView::ShouldShowAvatar() const { |
| return false; |
| if (IsOffTheRecord()) |
| return true; |
| + if (ManagedMode::IsInManagedMode()) |
| + return true; |
| ProfileInfoCache& cache = |
| g_browser_process->profile_manager()->GetProfileInfoCache(); |
| @@ -559,6 +562,16 @@ SkBitmap BrowserView::GetOTRAvatarIcon() const { |
| return *otr_avatar_; |
| } |
| +SkBitmap BrowserView::GetManagedModeAvatarIcon() const { |
| + static SkBitmap* managed_mode_avatar_ = new SkBitmap(); |
| + |
| + if (managed_mode_avatar_->isNull()) { |
| + ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); |
| + *managed_mode_avatar_ = *rb.GetBitmapNamed(IDR_MANAGED_MODE_AVATAR); |
|
sky
2012/04/25 17:12:26
This is deprecated, don't use it in new code.
Bernhard Bauer
2012/04/25 17:57:30
Done.
|
| + } |
| + return *managed_mode_avatar_; |
| +} |
| + |
| SkBitmap BrowserView::GetGuestAvatarIcon() const { |
| #if defined(OS_CHROMEOS) |
| static SkBitmap* guest_avatar_ = new SkBitmap(); |