summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-29 14:54:55 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-29 14:54:55 +0000
commitb54b3fae08eee524456da5fdc598485e251cc8a0 (patch)
treed42842faefe4db1635e3b6d504d1d41bbf4992db /ui
parent8570b620893a18f9d26c2ffa46baa156b7909751 (diff)
downloadchromium_src-b54b3fae08eee524456da5fdc598485e251cc8a0.zip
chromium_src-b54b3fae08eee524456da5fdc598485e251cc8a0.tar.gz
chromium_src-b54b3fae08eee524456da5fdc598485e251cc8a0.tar.bz2
ui/gfx: Remove unused map from NativeThemeAura.
R=asvitkine@chromium.org Review URL: https://chromiumcodereview.appspot.com/9844033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129625 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r--ui/gfx/native_theme_aura.cc14
-rw-r--r--ui/gfx/native_theme_aura.h13
2 files changed, 10 insertions, 17 deletions
diff --git a/ui/gfx/native_theme_aura.cc b/ui/gfx/native_theme_aura.cc
index 0ae70d8..3eb07f9 100644
--- a/ui/gfx/native_theme_aura.cc
+++ b/ui/gfx/native_theme_aura.cc
@@ -4,10 +4,10 @@
#include "ui/gfx/native_theme_aura.h"
-#include "base/basictypes.h"
#include "base/logging.h"
#include "grit/gfx_resources.h"
#include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/rect.h"
#include "ui/gfx/size.h"
#include "ui/gfx/skbitmap_operations.h"
@@ -131,7 +131,7 @@ void NativeThemeAura::PaintScrollbarTrack(
State state,
const ScrollbarTrackExtraParams& extra_params,
const gfx::Rect& rect) const {
- ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+ ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
if (part == kScrollbarVerticalTrack) {
int center_offset = 0;
int center_height = rect.height();
@@ -200,13 +200,17 @@ void NativeThemeAura::PaintScrollbarTrack(
}
void NativeThemeAura::PaintArrowButton(SkCanvas* canvas,
- const gfx::Rect& rect, Part part, State state) const {
+ const gfx::Rect& rect,
+ Part part,
+ State state) const {
DCHECK(rect.IsEmpty());
}
void NativeThemeAura::PaintScrollbarThumb(SkCanvas* canvas,
- Part part, State state, const gfx::Rect& rect) const {
- ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+ Part part,
+ State state,
+ const gfx::Rect& rect) const {
+ ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
if (part == kScrollbarVerticalThumb) {
int top_resource_id =
state == kHovered ? IDR_SCROLL_THUMB_VERTICAL_TOP_H :
diff --git a/ui/gfx/native_theme_aura.h b/ui/gfx/native_theme_aura.h
index 4e83b87..de4b10d 100644
--- a/ui/gfx/native_theme_aura.h
+++ b/ui/gfx/native_theme_aura.h
@@ -6,13 +6,9 @@
#define UI_GFX_NATIVE_THEME_AURA_H_
#pragma once
-#include <map>
-
+#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "ui/gfx/native_theme_base.h"
-#include "ui/gfx/rect.h"
-
-class SkBitmap;
namespace gfx {
@@ -44,13 +40,6 @@ class NativeThemeAura : public NativeThemeBase {
State state,
const gfx::Rect& rect) const OVERRIDE;
- SkBitmap* GetHorizontalBitmapNamed(int resource_id) const;
-
- // Cached images. Resource loader caches all retrieved bitmaps and keeps
- // ownership of the pointers.
- typedef std::map<int, SkBitmap*> SkImageMap;
- mutable SkImageMap horizontal_bitmaps_;
-
DISALLOW_COPY_AND_ASSIGN(NativeThemeAura);
};