Add a button to exit managed mode.

chrome/browser/ui/gtk/browser_titlebar.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/gtk/browser_titlebar.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/i18n/rtl.h"
 #include "base/memory/singleton.h"
 #include "base/string_piece.h"
 #include "base/string_tokenizer.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.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/ui/browser.h"
 #include "chrome/browser/ui/gtk/accelerators_gtk.h"
 #include "chrome/browser/ui/gtk/avatar_menu_button_gtk.h"
 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
 #include "chrome/browser/ui/gtk/custom_button.h"
 #if defined(USE_GCONF)
 #include "chrome/browser/ui/gtk/gconf_titlebar_listener.h"
@@ skipping 73 matching lines @@
 // maximized).
 const int kMaximizedTabstripPadding = 16;
 
 gboolean OnMouseMoveEvent(GtkWidget* widget, GdkEventMotion* event,
                           BrowserWindowGtk* browser_window) {
   // Reset to the default mouse cursor.
   browser_window->ResetCustomFrameCursor();
   return TRUE;
 }
 
-GdkPixbuf* GetOTRAvatar() {
-  static GdkPixbuf* otr_avatar = NULL;
-  if (!otr_avatar) {
-    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-    otr_avatar = rb.GetNativeImageNamed(
-        IDR_OTR_ICON, ui::ResourceBundle::RTL_ENABLED).ToGdkPixbuf();
-  }
-  return otr_avatar;
-}
-
 // Converts a GdkColor to a color_utils::HSL.
 color_utils::HSL GdkColorToHSL(const GdkColor* color) {
   color_utils::HSL hsl;
   color_utils::SkColorToHSL(SkColorSetRGB(color->red >> 8,
                                           color->green >> 8,
                                           color->blue >> 8), &hsl);
   return hsl;
 }
 
 // Returns either |one| or |two| based on which has a greater difference in
 // luminosity.
 GdkColor PickLuminosityContrastingColor(const GdkColor* base,
                                         const GdkColor* one,
                                         const GdkColor* two) {
   // Convert all GdkColors to color_utils::HSLs.
   color_utils::HSL baseHSL = GdkColorToHSL(base);
   color_utils::HSL oneHSL = GdkColorToHSL(one);
   color_utils::HSL twoHSL = GdkColorToHSL(two);
   double one_difference = fabs(baseHSL.l - oneHSL.l);
   double two_difference = fabs(baseHSL.l - twoHSL.l);
 
   // Be biased towards the first color presented.
   if (two_difference > one_difference + 0.1)
     return *two;
   else
     return *one;
 }
 
-// Returns true if there are multiple profiles created. This is used to
-// determine whether to display the avatar image.
-bool HasMultipleProfiles() {
-  ProfileInfoCache& cache =
-      g_browser_process->profile_manager()->GetProfileInfoCache();
-  return ProfileManager::IsMultipleProfilesEnabled() &&
-      cache.GetNumberOfProfiles() > 1;
-}
-
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // PopupPageMenuModel
 
 // A menu model that builds the contents of the menu shown for popups (when the
 // user clicks on the favicon) and all of its submenus.
 class PopupPageMenuModel : public ui::SimpleMenuModel {
  public:
   PopupPageMenuModel(ui::SimpleMenuModel::Delegate* delegate, Browser* browser);
@@ skipping 624 matching lines @@
 void BrowserTitlebar::UpdateAvatar() {
   // Remove previous state.
   gtk_util::RemoveAllChildren(titlebar_left_avatar_frame_);
   gtk_util::RemoveAllChildren(titlebar_right_avatar_frame_);
 
   if (!ShouldDisplayAvatar())
     return;
 
   if (!avatar_) {
     if (IsOffTheRecord()) {
-      avatar_ = gtk_image_new_from_pixbuf(GetOTRAvatar());
+      ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+      gfx::Image avatar_image =
+          rb.GetNativeImageNamed(IDR_OTR_ICON, ui::ResourceBundle::RTL_ENABLED);
+      avatar_ = gtk_image_new_from_pixbuf(avatar_image.ToGdkPixbuf());
       gtk_misc_set_alignment(GTK_MISC(avatar_), 0.0, 1.0);
       gtk_widget_set_size_request(avatar_, -1, 0);
     } else {
-      // Is using multi-profile avatar.
+      // Use a clickable avatar.
       avatar_ = avatar_button_->widget();
     }
   }
 
   gtk_widget_show_all(avatar_);
 
   if (display_avatar_on_left_) {
     gtk_container_add(GTK_CONTAINER(titlebar_left_avatar_frame_), avatar_);
     gtk_widget_show(titlebar_left_avatar_frame_);
     gtk_widget_hide(titlebar_right_avatar_frame_);
   } else {
     gtk_container_add(GTK_CONTAINER(titlebar_right_avatar_frame_), avatar_);
     gtk_widget_show(titlebar_right_avatar_frame_);
     gtk_widget_hide(titlebar_left_avatar_frame_);
   }
 
   if (IsOffTheRecord())
     return;
 
-  ProfileInfoCache& cache =
-      g_browser_process->profile_manager()->GetProfileInfoCache();
-  Profile* profile = browser_window_->browser()->profile();
-  size_t index = cache.GetIndexOfProfileWithPath(profile->GetPath());
-  if (index != std::string::npos) {
-    bool is_gaia_picture =
+  bool is_gaia_picture = false;
+  gfx::Image avatar;
+  if (ManagedMode::IsInManagedMode()) {
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+    avatar = rb.GetNativeImageNamed(IDR_MANAGED_MODE_AVATAR,
+                                    ui::ResourceBundle::RTL_ENABLED);
+  } else {
+    ProfileInfoCache& cache =
+        g_browser_process->profile_manager()->GetProfileInfoCache();
+    Profile* profile = browser_window_->browser()->profile();
+    size_t index = cache.GetIndexOfProfileWithPath(profile->GetPath());
+    if (index == std::string::npos)
+      return;

[Evan Stade, 2012/04/26 18:27:51]

nit: \n

[Bernhard Bauer, 2012/04/27 08:59:23]

Done.

+    is_gaia_picture =
         cache.IsUsingGAIAPictureOfProfileAtIndex(index) &&
         cache.GetGAIAPictureOfProfileAtIndex(index);
-    avatar_button_->SetIcon(
-        cache.GetAvatarIconOfProfileAtIndex(index), is_gaia_picture);
+    avatar = cache.GetAvatarIconOfProfileAtIndex(index);
+  }
+  avatar_button_->SetIcon(avatar, is_gaia_picture);
 
-    BubbleGtk::ArrowLocationGtk arrow_location =
-        display_avatar_on_left_ ^ base::i18n::IsRTL() ?
-            BubbleGtk::ARROW_LOCATION_TOP_LEFT :
-            BubbleGtk::ARROW_LOCATION_TOP_RIGHT;
-    avatar_button_->set_menu_arrow_location(arrow_location);
-  }
+  BubbleGtk::ArrowLocationGtk arrow_location =
+      display_avatar_on_left_ ^ base::i18n::IsRTL() ?
+          BubbleGtk::ARROW_LOCATION_TOP_LEFT :
+          BubbleGtk::ARROW_LOCATION_TOP_RIGHT;
+  avatar_button_->set_menu_arrow_location(arrow_location);
 }
 
 void BrowserTitlebar::ShowFaviconMenu(GdkEventButton* event) {
   if (!favicon_menu_model_.get()) {
     favicon_menu_model_.reset(
         new PopupPageMenuModel(this, browser_window_->browser()));
 
     favicon_menu_.reset(new MenuGtk(NULL, favicon_menu_model_.get()));
   }
 
@@ skipping 229 matching lines @@
   // to NULL during that time.
   if (!window_)
     return;
 
   window_has_focus_ =
       gtk_widget_get_window(GTK_WIDGET(window_)) == active_window;
   UpdateTextColor();
 }
 
 bool BrowserTitlebar::ShouldDisplayAvatar() {
-  return (IsOffTheRecord() || HasMultipleProfiles()) &&
-      browser_window_->browser()->is_type_tabbed();
+  if (IsOffTheRecord() || ManagedMode::IsInManagedMode())
+    return true;
+  if (!browser_window_->browser()->is_type_tabbed())
+    return false;

[Evan Stade, 2012/04/26 18:27:51]

nit: need vertical space in this function

[Bernhard Bauer, 2012/04/27 08:59:23]

Done.

+  return AvatarMenuModel::ShouldShowAvatarMenu();
 }
 
 bool BrowserTitlebar::IsOffTheRecord() {
   return browser_window_->browser()->profile()->IsOffTheRecord();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserTitlebar::Throbber implementation
 // TODO(tc): Handle anti-clockwise spinning when waiting for a connection.
 
@@ skipping 53 matching lines @@
     ui::SimpleMenuModel::Delegate* delegate)
     : SimpleMenuModel(delegate) {
   AddItemWithStringId(IDC_NEW_TAB, IDS_TAB_CXMENU_NEWTAB);
   AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB);
   AddSeparator();
   AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
   AddSeparator();
   AddCheckItemWithStringId(kShowWindowDecorationsCommand,
                            IDS_SHOW_WINDOW_DECORATIONS_MENU);
 }