Commit 92e44ddd authored by xiyuan@chromium.org's avatar xiyuan@chromium.org

Update ChromeOS theme engine to follow mocks in chromium-os:9256.

BUG=chromium-os:9256
TEST=Verify web widgets (aka form controls) look close to the mock in chromium-os:9256.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71991 0039d316-1c4b-4281-b951-d872f2087c98
parent 54ff109f
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#define CHROME_BROWSER_CHROMEOS_NATIVE_THEME_CHROMEOS_H_ #define CHROME_BROWSER_CHROMEOS_NATIVE_THEME_CHROMEOS_H_
#include <map> #include <map>
#include "base/compiler_specific.h"
#include "gfx/native_theme_linux.h" #include "gfx/native_theme_linux.h"
class SkBitmap; class SkBitmap;
...@@ -17,17 +18,70 @@ class NativeThemeChromeos : public gfx::NativeThemeLinux { ...@@ -17,17 +18,70 @@ class NativeThemeChromeos : public gfx::NativeThemeLinux {
virtual ~NativeThemeChromeos(); virtual ~NativeThemeChromeos();
// Scrollbar painting overrides // Scrollbar painting overrides
virtual gfx::Size GetPartSize(Part part) const; virtual gfx::Size GetPartSize(Part part) const OVERRIDE;
virtual void PaintScrollbarTrack(skia::PlatformCanvas* canvas, virtual void PaintScrollbarTrack(skia::PlatformCanvas* canvas,
Part part, State state, Part part, State state,
const ScrollbarTrackExtraParams& extra_params, const ScrollbarTrackExtraParams& extra_params,
const gfx::Rect& rect); const gfx::Rect& rect) OVERRIDE;
virtual void PaintArrowButton(skia::PlatformCanvas* canvas, virtual void PaintArrowButton(skia::PlatformCanvas* canvas,
const gfx::Rect& rect, Part direction, State state); const gfx::Rect& rect, Part direction, State state) OVERRIDE;
virtual void PaintScrollbarThumb(skia::PlatformCanvas* canvas, virtual void PaintScrollbarThumb(skia::PlatformCanvas* canvas,
Part part, State state, const gfx::Rect& rect); Part part, State state, const gfx::Rect& rect) OVERRIDE;
// Draw the checkbox.
virtual void PaintCheckbox(skia::PlatformCanvas* canvas,
State state, const gfx::Rect& rect,
const ButtonExtraParams& button) OVERRIDE;
// Draw the radio.
virtual void PaintRadio(skia::PlatformCanvas* canvas,
State state,
const gfx::Rect& rect,
const ButtonExtraParams& button) OVERRIDE;
// Draw the push button.
virtual void PaintButton(skia::PlatformCanvas* canvas,
State state,
const gfx::Rect& rect,
const ButtonExtraParams& button) OVERRIDE;
// Draw the text field.
virtual void PaintTextField(skia::PlatformCanvas* canvas,
State state,
const gfx::Rect& rect,
const TextFieldExtraParams& text) OVERRIDE;
// Draw the slider track.
virtual void PaintSliderTrack(skia::PlatformCanvas* canvas,
State state,
const gfx::Rect& rect,
const SliderExtraParams& slider) OVERRIDE;
// Draw the slider thumb.
virtual void PaintSliderThumb(skia::PlatformCanvas* canvas,
State state,
const gfx::Rect& rect,
const SliderExtraParams& slider) OVERRIDE;
// Draw the inner spin button.
virtual void PaintInnerSpinButton(skia::PlatformCanvas* canvas,
State state,
const gfx::Rect& rect,
const InnerSpinButtonExtraParams& spin_button) OVERRIDE;
// Draw the progress bar.
virtual void PaintProgressBar(skia::PlatformCanvas* canvas,
State state,
const gfx::Rect& rect,
const ProgressBarExtraParams& progress_bar) OVERRIDE;
SkBitmap* GetHorizontalBitmapNamed(int resource_id); SkBitmap* GetHorizontalBitmapNamed(int resource_id);
// Paint a button like rounded rect with gradient background and stroke.
void PaintButtonLike(skia::PlatformCanvas* canvas,
State state, const gfx::Rect& rect,
const ButtonExtraParams& button);
// Cached images. The ResourceBundle caches all retrieved bitmaps and keeps // Cached images. The ResourceBundle caches all retrieved bitmaps and keeps
// ownership of the pointers. // ownership of the pointers.
typedef std::map<int, SkBitmap*> SkImageMap; typedef std::map<int, SkBitmap*> SkImageMap;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment