linux: delete code that worked around gtk <2.18

chrome/browser/ui/gtk/global_bookmark_menu.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/global_bookmark_menu.h"
 
 #include <dlfcn.h>
 #include <gtk/gtk.h>
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h"
 #include "chrome/browser/ui/gtk/global_bookmark_menu.h"
 #include "chrome/browser/ui/gtk/global_menu_bar.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/common/notification_service.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/gtk_util.h"
 
-namespace {
-
-// We need to know whether we're using a newer GTK at run time because we need
-// to prevent.
-//
-// TODO(erg): Once we've dropped Hardy support, remove this hack.
-typedef void (*gtk_menu_item_set_label_func)(GtkMenuItem*, const gchar*);
-gtk_menu_item_set_label_func gtk_menu_item_set_label_sym =
-#if GTK_CHECK_VERSION(2, 16, 1)
-    gtk_menu_item_set_label;
-#else
-    NULL;
-#endif
-
-void EnsureMenuItemFunctions() {
-#if !GTK_CHECK_VERSION(2, 16, 1)
-  static bool methods_looked_up = false;
-  if (!methods_looked_up) {
-    methods_looked_up = true;
-    gtk_menu_item_set_label_sym =
-        reinterpret_cast<gtk_menu_item_set_label_func>(
-            dlsym(NULL, "gtk_menu_item_set_label"));
-  }
-#endif
-}
-
-}  // namespace
-
 GlobalBookmarkMenu::GlobalBookmarkMenu(Browser* browser)
     : browser_(browser),
       profile_(browser->profile()),
       default_favicon_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
   DCHECK(profile_);
 
   default_favicon_ = GtkThemeService::GetDefaultFavicon(true);
   default_folder_ = GtkThemeService::GetFolderIcon(true);
   registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                  Source<ThemeService>(
                      ThemeServiceFactory::GetForProfile(profile_)));
 }
 
 GlobalBookmarkMenu::~GlobalBookmarkMenu() {
   profile_->GetBookmarkModel()->RemoveObserver(this);
 }
 
 void GlobalBookmarkMenu::Init(GtkWidget* bookmark_menu,
                               GtkWidget* bookmark_menu_item) {
   bookmark_menu_.Own(bookmark_menu);
 
-  EnsureMenuItemFunctions();
-  if (gtk_menu_item_set_label_sym) {
-    BookmarkModel* model = profile_->GetBookmarkModel();
-    model->AddObserver(this);
-    if (model->IsLoaded())
-      Loaded(model, false);
-  }
+  BookmarkModel* model = profile_->GetBookmarkModel();
+  model->AddObserver(this);
+  if (model->IsLoaded())
+    Loaded(model, false);
 }
 
 void GlobalBookmarkMenu::RebuildMenuInFuture() {
   method_factory_.RevokeAll();
   MessageLoop::current()->PostTask(
       FROM_HERE,
       method_factory_.NewRunnableMethod(&GlobalBookmarkMenu::RebuildMenu));
 }
 
 void GlobalBookmarkMenu::RebuildMenu() {
@@ skipping 66 matching lines @@
       AddBookmarkMenuItem(menu, item);
     }
   }
 }
 
 void GlobalBookmarkMenu::ConfigureMenuItem(const BookmarkNode* node,
                                            GtkWidget* menu_item) {
   CHECK(node);
   CHECK(menu_item);
 
-  // This check is only to make things compile on Hardy; this code won't
-  // display any visible widgets in older systems that don't have a global menu
-  // bar.
-  if (gtk_menu_item_set_label_sym) {
-    gtk_menu_item_set_label_sym(
-        GTK_MENU_ITEM(menu_item),
-        bookmark_utils::BuildMenuLabelFor(node).c_str());
-  }
+  gtk_menu_item_set_label(GTK_MENU_ITEM(menu_item),
+                          bookmark_utils::BuildMenuLabelFor(node).c_str());
 
   if (node->is_url()) {
     gtk_widget_set_tooltip_markup(
         menu_item,
         bookmark_utils::BuildTooltipFor(node).c_str());
   }
 
   const SkBitmap& bitmap = profile_->GetBookmarkModel()->GetFavicon(node);
   if (!bitmap.isNull()) {
     GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(&bitmap);
@@ skipping 107 matching lines @@
 void GlobalBookmarkMenu::OnBookmarkItemActivated(GtkWidget* menu_item) {
   // The actual mouse event that generated this activated event was in a
   // different process. Go with something default.
   const BookmarkNode* node = static_cast<const BookmarkNode*>(
       g_object_get_data(G_OBJECT(menu_item), "bookmark-node"));
 
   browser_->OpenURL(node->url(), GURL(), NEW_FOREGROUND_TAB,
                     PageTransition::AUTO_BOOKMARK);
 }