Multi-Profiles: Add delete profile command

chrome/browser/ui/gtk/browser_titlebar.cc

 // Copyright (c) 2011 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>
@@ skipping 302 matching lines @@
   if (browser_command_line.HasSwitch(switches::kMultiProfiles) &&
       !browser_window_->browser()->profile()->IsOffTheRecord()) {
     PrefService* prefs = browser_window_->browser()->profile()->GetPrefs();
     usernamePref_.Init(prefs::kGoogleServicesUsername, prefs, this);
 
     titlebar_profile_vbox_ = gtk_vbox_new(FALSE, 0);
     gtk_box_pack_end(GTK_BOX(container_hbox_), titlebar_profile_vbox_,
                        FALSE, FALSE, 0);
     gtk_widget_show_all(titlebar_profile_vbox_);
 
-    profile_button_.reset(new ProfileMenuButton());
+    profile_button_.reset(new ProfileMenuButton(
+        browser_window_->browser()->profile()));
     gtk_box_pack_start(GTK_BOX(titlebar_profile_vbox_),
                        profile_button_->widget(), FALSE, FALSE, 0);
-    profile_button_->UpdateText(browser_window_->browser()->profile());
+    profile_button_->UpdateText();
   }
 
   if (browser_window_->browser()->profile()->IsOffTheRecord() &&
       browser_window_->browser()->is_type_tabbed()) {
     titlebar_right_spy_frame_ = gtk_alignment_new(0.0, 0.0, 1.0, 1.0);
     gtk_widget_set_no_show_all(titlebar_right_spy_frame_, TRUE);
     gtk_alignment_set_padding(GTK_ALIGNMENT(titlebar_right_spy_frame_), 0,
         kOTRBottomSpacing, kOTRSideSpacing, kOTRSideSpacing);
     gtk_box_pack_end(GTK_BOX(container_hbox_), titlebar_right_spy_frame_,
                      FALSE, FALSE, 0);
@@ skipping 608 matching lines @@
                               const NotificationSource& source,
                               const NotificationDetails& details) {
   switch (type.value) {
     case NotificationType::BROWSER_THEME_CHANGED:
       UpdateTextColor();
       break;
 
     case NotificationType::PREF_CHANGED: {
       std::string* name = Details<std::string>(details).ptr();
       if (prefs::kGoogleServicesUsername == *name)
-        profile_button_->UpdateText(browser_window_->browser()->profile());
+        profile_button_->UpdateText();
       break;
     }
 
     default:
       NOTREACHED();
   }
 }
 
 void BrowserTitlebar::ActiveWindowChanged(GdkWindow* active_window) {
   // Can be called during shutdown; BrowserWindowGtk will set our |window_|
@@ skipping 76 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);
 }