Dup of Issue 7465011: Larger Combo box Hit Targets for TOUCH_UI

BUG=none
TEST=none

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

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

4 files changed, 16 insertions, 0 deletions

diff --git a/ui/gfx/native_theme.cc b/ui/gfx/native_theme.cc
index 331d429..e747b8e 100644
--- a/ui/gfx/native_theme.cc
+++ b/ui/gfx/native_theme.cc
@@ -12,6 +12,10 @@ unsigned int NativeTheme::thumb_inactive_color_ = 0xeaeaea;
 unsigned int NativeTheme::thumb_active_color_ = 0xf4f4f4;
 unsigned int NativeTheme::track_color_ = 0xd3d3d3;
 
+int NativeTheme::GetPopupListBoxMinimumRowHeight() const {
+  return 0;
+}
+
 void NativeTheme::SetScrollbarColors(unsigned inactive_color,
                                      unsigned active_color,
                                      unsigned track_color) const {
diff --git a/ui/gfx/native_theme.h b/ui/gfx/native_theme.h
index 2f1ba70..dd35a9e 100644
--- a/ui/gfx/native_theme.h
+++ b/ui/gfx/native_theme.h
@@ -205,6 +205,8 @@ class UI_API NativeTheme {
                      const gfx::Rect& rect,
                      const ExtraParams& extra) const = 0;
 
+  virtual int GetPopupListBoxMinimumRowHeight() const;
+
   // 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 a12b45f..22e6bbe 100644
--- a/ui/gfx/native_theme_chromeos.cc
+++ b/ui/gfx/native_theme_chromeos.cc
@@ -301,6 +301,14 @@ 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 1e1b84f..609ecd7 100644
--- a/ui/gfx/native_theme_chromeos.h
+++ b/ui/gfx/native_theme_chromeos.h
@@ -22,6 +22,8 @@ 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,