Add a button to exit managed mode.

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

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..0244c3ffdb24660bc53c67189cdfbb5b1371d761 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();
@@ -554,18 +557,29 @@ SkBitmap BrowserView::GetOTRAvatarIcon() const {
 
   if (otr_avatar_->isNull()) {
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-    *otr_avatar_ = *rb.GetBitmapNamed(IDR_OTR_ICON);
+    *otr_avatar_ = *rb.GetImageNamed(IDR_OTR_ICON).ToSkBitmap();
   }
   return *otr_avatar_;
 }
 
+SkBitmap BrowserView::GetManagedModeAvatarIcon() const {
+  static SkBitmap* managed_mode_avatar_ = new SkBitmap();

[sail, 2012/04/25 18:02:46]

you don't need this static, the resource bundle will cache the image
automatically

[Bernhard Bauer, 2012/04/26 16:46:15]

Done.

+
+  if (managed_mode_avatar_->isNull()) {
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+    *managed_mode_avatar_ = *rb.GetImageNamed(
+        IDR_MANAGED_MODE_AVATAR).ToSkBitmap();
+  }
+  return *managed_mode_avatar_;
+}
+
 SkBitmap BrowserView::GetGuestAvatarIcon() const {
 #if defined(OS_CHROMEOS)
   static SkBitmap* guest_avatar_ = new SkBitmap();
 
   if (guest_avatar_->isNull()) {
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-    *guest_avatar_ = *rb.GetBitmapNamed(IDR_GUEST_ICON);
+    *guest_avatar_ = *rb.GetImageNamed(IDR_GUEST_ICON).ToSkBitmap();
   }
   return *guest_avatar_;
 #else