summaryrefslogtreecommitdiffstats
path: root/ui/gfx
diff options
context:
space:
mode:
authorsaintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-20 23:29:35 +0000
committersaintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-20 23:29:35 +0000
commita8f33f0b8866d60dd08b58275603560aa4205451 (patch)
treecd582824d4111e7bfcb2b359cf24a64d2bdd3ae4 /ui/gfx
parent3b464ee10e582871afd08c2aad649a116b39c82a (diff)
downloadchromium_src-a8f33f0b8866d60dd08b58275603560aa4205451.zip
chromium_src-a8f33f0b8866d60dd08b58275603560aa4205451.tar.gz
chromium_src-a8f33f0b8866d60dd08b58275603560aa4205451.tar.bz2
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
Diffstat (limited to 'ui/gfx')
-rw-r--r--ui/gfx/native_theme.h2
-rw-r--r--ui/gfx/native_theme_chromeos.cc8
-rw-r--r--ui/gfx/native_theme_chromeos.h2
3 files changed, 0 insertions, 12 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,