[reland] views: Move MenuButton from TextButton to LabelButton.

chrome/browser/ui/libgtk2ui/gtk2_ui.h

 // Copyright (c) 2013 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_LIBGTK2UI_GTK2_UI_H_
 #define CHROME_BROWSER_UI_LIBGTK2UI_GTK2_UI_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 85 matching lines @@
   virtual void SetDownloadCount(int count) const OVERRIDE;
   virtual void SetProgressFraction(float percentage) const OVERRIDE;
   virtual bool IsStatusIconSupported() const OVERRIDE;
   virtual scoped_ptr<views::StatusIconLinux> CreateLinuxStatusIcon(
       const gfx::ImageSkia& image,
       const base::string16& tool_tip) const OVERRIDE;
   virtual gfx::Image GetIconForContentType(
       const std::string& content_type, int size) const OVERRIDE;
   virtual scoped_ptr<views::Border> CreateNativeBorder(
       views::LabelButton* owning_button,
-      scoped_ptr<views::Border> border) OVERRIDE;
+      scoped_ptr<views::LabelButtonBorder> border) OVERRIDE;
   virtual void AddWindowButtonOrderObserver(
       views::WindowButtonOrderObserver* observer) OVERRIDE;
   virtual void RemoveWindowButtonOrderObserver(
       views::WindowButtonOrderObserver* observer) OVERRIDE;
   virtual bool UnityIsRunning() OVERRIDE;
   virtual NonClientMiddleClickAction GetNonClientMiddleClickAction() OVERRIDE;
   virtual void NotifyWindowManagerStartupComplete() OVERRIDE;
 
   // ui::TextEditKeybindingDelegate:
   virtual bool MatchEvent(
@@ skipping 138 matching lines @@
 }  // namespace libgtk2ui
 
 // Access point to the GTK2 desktop system. This should be the only symbol that
 // is exported in the library; everything else should be used through the
 // interface, because eventually this .so will be loaded through dlopen at
 // runtime so our main binary can conditionally load GTK2 or GTK3 or EFL or
 // QT or whatever.
 LIBGTK2UI_EXPORT views::LinuxUI* BuildGtk2UI();
 
 #endif  // CHROME_BROWSER_UI_LIBGTK2UI_GTK2_UI_H_