linux_aura: Fixes a couple of issues with the button border integration.

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 "third_party/skia/include/core/SkColor.h"
 #include "ui/base/ime/linux/linux_input_method_context_factory.h"
 #include "ui/gfx/linux_font_delegate.h"
 #include "ui/shell_dialogs/linux_shell_dialog.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/linux_ui/status_icon_linux.h"
 #include "ui/views/views_export.h"
 
 // The main entrypoint into Linux toolkit specific code. GTK code should only
 // be executed behind this interface.
 
 namespace gfx {
 class Image;
 }
 
 namespace ui {
 class NativeTheme;
 }
 
 namespace views {
 class Border;
-class CustomButton;
+class LabelButton;
 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 56 matching lines @@
       const base::string16& tool_tip) const = 0;
 
   // 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::CustomButton* owning_button,
+      views::LabelButton* owning_button,
       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;
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_LINUX_UI_LINUX_UI_H_