revert r93279

BUG=none
TEST=none

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

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

5 files changed, 1 insertions, 19 deletions

diff --git a/ui/gfx/native_theme.h b/ui/gfx/native_theme.h
index ceab5c3..2f1ba70 100644
--- a/ui/gfx/native_theme.h
+++ b/ui/gfx/native_theme.h
@@ -205,8 +205,6 @@ class UI_API NativeTheme {
                      const gfx::Rect& rect,
                      const ExtraParams& extra) const = 0;
 
-  virtual int GetPopupListBoxMinimumRowHeight() const { return 0; }
-
   // Supports theme specific colors.
   void SetScrollbarColors(unsigned inactive_color,
                           unsigned active_color,
diff --git a/ui/gfx/native_theme_chromeos.cc b/ui/gfx/native_theme_chromeos.cc
index 22e6bbe..a12b45f 100644
--- a/ui/gfx/native_theme_chromeos.cc
+++ b/ui/gfx/native_theme_chromeos.cc
@@ -301,14 +301,6 @@ gfx::Size NativeThemeChromeos::GetPartSize(Part part,
   return gfx::Size(width, height);
 }
 
-int NativeThemeChromeos::GetPopupListBoxMinimumRowHeight() const {
-#if defined(TOUCH_UI)
-  return 60;
-#else
-  return 0;
-#endif
-}
-
 void NativeThemeChromeos::PaintScrollbarTrack(
     SkCanvas* canvas,
     Part part,
diff --git a/ui/gfx/native_theme_chromeos.h b/ui/gfx/native_theme_chromeos.h
index 609ecd7..1e1b84f 100644
--- a/ui/gfx/native_theme_chromeos.h
+++ b/ui/gfx/native_theme_chromeos.h
@@ -22,8 +22,6 @@ class NativeThemeChromeos : public gfx::NativeThemeLinux {
                                 State state,
                                 const ExtraParams& extra) const OVERRIDE;
 
-  virtual int GetPopupListBoxMinimumRowHeight() const OVERRIDE;
-
   // NativeThemeLinux overrides
   virtual void PaintScrollbarTrack(SkCanvas* canvas,
       Part part, State state,
diff --git a/webkit/glue/webthemeengine_impl_linux.cc b/webkit/glue/webthemeengine_impl_linux.cc
index fd1bdd8..6726158 100644
--- a/webkit/glue/webthemeengine_impl_linux.cc
+++ b/webkit/glue/webthemeengine_impl_linux.cc
@@ -182,9 +182,4 @@ void WebThemeEngineImpl::paint(
       WebRectToRect(rect),
       native_theme_extra_params);
 }
-
-int WebThemeEngineImpl::getPopupListBoxMinimumRowHeight() const {
-  return gfx::NativeTheme::instance()->GetPopupListBoxMinimumRowHeight();
-}
-
 }  // namespace webkit_glue
diff --git a/webkit/glue/webthemeengine_impl_linux.h b/webkit/glue/webthemeengine_impl_linux.h
index 717d691..3dcba6d 100644
--- a/webkit/glue/webthemeengine_impl_linux.h
+++ b/webkit/glue/webthemeengine_impl_linux.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
@@ -19,7 +19,6 @@ class WebThemeEngineImpl : public WebKit::WebThemeEngine {
       WebKit::WebThemeEngine::State,
       const WebKit::WebRect&,
       const WebKit::WebThemeEngine::ExtraParams*);
-  virtual int getPopupListBoxMinimumRowHeight() const;
 };
 
 }  // namespace webkit_glue