Revert of views: Move MenuButton from TextButton to LabelButton.

ui/views/linux_ui/linux_ui.h

 // Copyright 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 UI_VIEWS_LINUX_UI_LINUX_UI_H_
 #define UI_VIEWS_LINUX_UI_LINUX_UI_H_
 
 #include <string>
 
 #include "base/callback.h"
@@ skipping 17 matching lines @@
 class Image;
 }
 
 namespace ui {
 class NativeTheme;
 }
 
 namespace views {
 class Border;
 class LabelButton;
-class LabelButtonBorder;
 class View;
 class WindowButtonOrderObserver;
 
 // Adapter class with targets to render like different toolkits. Set by any
 // project that wants to do linux desktop native rendering.
 //
 // TODO(erg): We're hardcoding GTK2, when we'll need to have backends for (at
 // minimum) GTK2 and GTK3. LinuxUI::instance() should actually be a very
 // complex method that pokes around with dlopen against a libuigtk2.so, a
 // liuigtk3.so, etc.
@@ skipping 70 matching lines @@
 
   // Returns the icon for a given content type from the icon theme.
   // TODO(davidben): Add an observer for the theme changing, so we can drop the
   // caches.
   virtual gfx::Image GetIconForContentType(
       const std::string& content_type, int size) const = 0;
 
   // Builds a Border which paints the native button style.
   virtual scoped_ptr<Border> CreateNativeBorder(
       views::LabelButton* owning_button,
-      scoped_ptr<views::LabelButtonBorder> border) = 0;
+      scoped_ptr<views::Border> border) = 0;
 
   // Notifies the observer about changes about how window buttons should be
   // laid out. If the order is anything other than the default min,max,close on
   // the right, will immediately send a button change event to the observer.
   virtual void AddWindowButtonOrderObserver(
       WindowButtonOrderObserver* observer) = 0;
 
   // Removes the observer from the LinuxUI's list.
   virtual void RemoveWindowButtonOrderObserver(
       WindowButtonOrderObserver* observer) = 0;
 
   // Determines whether the user's window manager is Unity.
   virtual bool UnityIsRunning() = 0;
 
   // What action we should take when the user middle clicks on non-client
   // area. The default is lowering the window.
   virtual NonClientMiddleClickAction GetNonClientMiddleClickAction() = 0;
 
   // Notifies the window manager that start up has completed.
   // Normally Chromium opens a new window on startup and GTK does this
   // automatically. In case Chromium does not open a new window on startup,
   // e.g. an existing browser window already exists, this should be called.
   virtual void NotifyWindowManagerStartupComplete() = 0;
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_LINUX_UI_LINUX_UI_H_