Add a button to exit managed mode.

chrome/browser/ui/views/frame/browser_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_view.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/i18n/rtl.h"
 #include "base/metrics/histogram.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/accessibility/invert_bubble_views.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_view.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/extensions/extension_tab_helper.h"
 #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"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/speech/extension_api/tts_extension_api.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/themes/theme_service.h"
@@ skipping 424 matching lines @@
 
 bool BrowserView::IsGuestSession() const {
   return browser_->profile()->IsGuestSession();
 }
 
 bool BrowserView::ShouldShowAvatar() const {
   if (!IsBrowserTypeNormal())
     return false;
   if (IsOffTheRecord())
     return true;
+  if (ManagedMode::IsInManagedMode())
+    return true;
 
   ProfileInfoCache& cache =
       g_browser_process->profile_manager()->GetProfileInfoCache();
   if (cache.GetIndexOfProfileWithPath(browser_->profile()->GetPath()) ==
       std::string::npos) {
     return false;
   }
 
   return AvatarMenuModel::ShouldShowAvatarMenu();
 }
@@ skipping 66 matching lines @@
 
 TabContentsWrapper* BrowserView::GetSelectedTabContentsWrapper() const {
   return browser_->GetSelectedTabContentsWrapper();
 }
 
 SkBitmap BrowserView::GetOTRAvatarIcon() const {
   static SkBitmap* otr_avatar_ = new SkBitmap();
 
   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
   NOTREACHED();
   return SkBitmap();
 #endif
 }
 
 // static
 void BrowserView::RegisterBrowserViewPrefs(PrefService* prefs) {
@@ skipping 1906 matching lines @@
     return;
 
   PasswordGenerationBubbleView* bubble =
       new PasswordGenerationBubbleView(bounds,
                                        this,
                                        web_contents->GetRenderViewHost());
   views::BubbleDelegateView::CreateBubble(bubble);
   bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE);
   bubble->Show();
 }