Makes views not draw focus for native controls on Gtk. As Gtk renders

the focus for us, this resulted in double the focus indicators.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/468004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33739 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 7 insertions, 0 deletions

diff --git a/views/controls/slider/slider.cc b/views/controls/slider/slider.cc
index ede29246..581bc9a 100644
--- a/views/controls/slider/slider.cc
+++ b/views/controls/slider/slider.cc
@@ -7,6 +7,7 @@
 #include <string>
 
 #include "views/controls/slider/native_slider_wrapper.h"
+#include "views/controls/native/native_view_host.h"
 #include "views/widget/widget.h"
 
 namespace views {
@@ -88,6 +89,11 @@ void Slider::Focus() {
   }
 }
 
+void Slider::PaintFocusBorder(gfx::Canvas* canvas) {
+  if (NativeViewHost::kRenderNativeControlFocus)
+    View::PaintFocusBorder(canvas);
+}
+
 void Slider::ViewHierarchyChanged(bool is_add, View* parent, View* child) {
   if (is_add && !native_wrapper_ && GetWidget()) {
     // The native wrapper's lifetime will be managed by the view hierarchy after
diff --git a/views/controls/slider/slider.h b/views/controls/slider/slider.h
index 2e44d8a..00079c4 100644
--- a/views/controls/slider/slider.h
+++ b/views/controls/slider/slider.h
@@ -71,6 +71,7 @@ class Slider : public View {
   virtual gfx::Size GetPreferredSize();
   virtual bool IsFocusable() const;
   virtual void SetEnabled(bool enabled);
+  virtual void PaintFocusBorder(gfx::Canvas* canvas);
 
  protected:
   virtual void Focus();