GTK: Implement popup favicon menu.

chrome/browser/gtk/browser_toolbar_gtk.cc

 // Copyright (c) 2009 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/gtk/browser_toolbar_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <X11/XF86keysym.h>
 
 #include "app/gtk_dnd_util.h"
@@ skipping 85 matching lines @@
 
   // When we created our MenuGtk objects, we pass them a pointer to our accel
   // group. Make sure to tear them down before |accel_group_|.
   page_menu_.reset();
   app_menu_.reset();
   page_menu_button_.Destroy();
   app_menu_button_.Destroy();
   g_object_unref(accel_group_);
 }
 
-// Construct an "encodings" menu based on profile settings.
-static MenuGtk* BuildEncodingsMenu(Profile* profile,
-                                   MenuGtk::Delegate* delegate) {
-  EncodingMenuController controller;
-  EncodingMenuController::EncodingMenuItemList items;
-  controller.GetEncodingMenuItems(profile, &items);
-
-  MenuGtk* menu = new MenuGtk(delegate, false);
-  GSList* radio_group = NULL;
-  for (EncodingMenuController::EncodingMenuItemList::const_iterator i =
-           items.begin();
-       i != items.end(); ++i) {
-    if (i == items.begin()) {
-      menu->AppendCheckMenuItemWithLabel(i->first, UTF16ToUTF8(i->second));
-    } else if (i->first == 0) {
-      menu->AppendSeparator();
-    } else {
-      GtkWidget* item =
-          gtk_radio_menu_item_new_with_label(radio_group,
-                                             UTF16ToUTF8(i->second).c_str());
-      radio_group = gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(item));
-      menu->AppendMenuItem(i->first, item);
-    }
-  }
-  return menu;
-}
-
 void BrowserToolbarGtk::Init(Profile* profile,
                              GtkWindow* top_level_window) {
   // Make sure to tell the location bar the profile before calling its Init.
   SetProfile(profile);
 
   theme_provider_ = GtkThemeProvider::GetFrom(profile);
   offscreen_entry_.Own(gtk_entry_new());
 
   show_home_button_.Init(prefs::kShowHomeButton, profile->GetPrefs(), this);
 
@@ skipping 72 matching lines @@
   // Group the menu buttons together in an hbox.
   GtkWidget* menus_hbox_ = gtk_hbox_new(FALSE, 0);
   GtkWidget* page_menu = BuildToolbarMenuButton(
       l10n_util::GetStringUTF8(IDS_PAGEMENU_TOOLTIP),
       &page_menu_button_);
   menu_bar_helper_.Add(page_menu_button_.get());
   page_menu_image_ = gtk_image_new_from_pixbuf(
       theme_provider_->GetRTLEnabledPixbufNamed(IDR_MENU_PAGE));
   gtk_container_add(GTK_CONTAINER(page_menu), page_menu_image_);
 
-  encodings_menu_.reset(BuildEncodingsMenu(profile, this));
-  page_menu_.reset(new MenuGtk(this, GetStandardPageMenu(encodings_menu_.get()),
+  page_menu_.reset(new MenuGtk(this, GetStandardPageMenu(profile_, this),
                                accel_group_));
   gtk_box_pack_start(GTK_BOX(menus_hbox_), page_menu, FALSE, FALSE, 0);
 
   GtkWidget* chrome_menu = BuildToolbarMenuButton(
       l10n_util::GetStringFUTF8(IDS_APPMENU_TOOLTIP,
           WideToUTF16(l10n_util::GetString(IDS_PRODUCT_NAME))),
       &app_menu_button_);
   menu_bar_helper_.Add(app_menu_button_.get());
   app_menu_image_ = gtk_image_new_from_pixbuf(
       theme_provider_->GetRTLEnabledPixbufNamed(IDR_MENU_CHROME));
@@ skipping 458 matching lines @@
   menu->PopupAsFromKeyEvent(button);
   menu_bar_helper_.MenuStartedShowing(button, menu->widget());
 }
 
 void BrowserToolbarGtk::PopupForButtonNextTo(GtkWidget* button,
                                              GtkMenuDirectionType dir) {
   GtkWidget* other_button = button == page_menu_button_.get() ?
       app_menu_button_.get() : page_menu_button_.get();
   PopupForButton(other_button);
 }