roll clang 131935:132017

chrome/browser/ui/gtk/menu_gtk.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_GTK_MENU_GTK_H_
 #define CHROME_BROWSER_UI_GTK_MENU_GTK_H_
 #pragma once
 
 #include <gtk/gtk.h>
 
@@ skipping 37 matching lines @@
     // Returns a tinted image used in button in a menu.
     virtual GtkIconSet* GetIconSetForId(int idr) { return NULL; }
 
     // Returns an icon for the menu item, if available.
     virtual GtkWidget* GetImageForCommandId(int command_id) const;
 
     static GtkWidget* GetDefaultImageForCommandId(int command_id);
   };
 
   MenuGtk(MenuGtk::Delegate* delegate, ui::MenuModel* model);
-  ~MenuGtk();
+  virtual ~MenuGtk();
 
   // Initialize GTK signal handlers.
   void ConnectSignalHandlers();
 
   // These methods are used to build the menu dynamically. The return value
   // is the new menu item.
   GtkWidget* AppendMenuItemWithLabel(int command_id, const std::string& label);
   GtkWidget* AppendMenuItemWithIcon(int command_id, const std::string& label,
                                     const SkBitmap& icon);
   GtkWidget* AppendCheckMenuItemWithLabel(int command_id,
@@ skipping 118 matching lines @@
   // menu.
   static bool block_activation_;
 
   // We must free these at shutdown.
   std::vector<MenuGtk*> submenus_we_own_;
 
   ScopedRunnableMethodFactory<MenuGtk> factory_;
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_MENU_GTK_H_