| Index: ui/gfx/native_theme_win.cc
|
| ===================================================================
|
| --- ui/gfx/native_theme_win.cc (revision 80026)
|
| +++ ui/gfx/native_theme_win.cc (working copy)
|
| @@ -14,8 +14,8 @@
|
| #include "base/win/scoped_gdi_object.h"
|
| #include "base/win/scoped_hdc.h"
|
| #include "base/win/windows_version.h"
|
| -#include "skia/ext/platform_canvas.h"
|
| #include "skia/ext/skia_utils_win.h"
|
| +#include "third_party/skia/include/core/SkCanvas.h"
|
| #include "third_party/skia/include/core/SkShader.h"
|
| #include "ui/gfx/gdi_util.h"
|
| #include "ui/gfx/rect.h"
|
| @@ -333,7 +333,7 @@
|
| int classic_state,
|
| RECT* target_rect,
|
| RECT* align_rect,
|
| - skia::PlatformCanvas* canvas) const {
|
| + SkCanvas* canvas) const {
|
| HANDLE handle = GetThemeHandle(SCROLLBAR);
|
| if (handle && draw_theme_)
|
| return draw_theme_(handle, hdc, part_id, state_id, target_rect, NULL);
|
| @@ -416,7 +416,7 @@
|
| int state_id,
|
| int classic_state,
|
| RECT* rect,
|
| - skia::PlatformCanvas* canvas) const {
|
| + SkCanvas* canvas) const {
|
| // Make the channel be 4 px thick in the center of the supplied rect. (4 px
|
| // matches what XP does in various menus; GetThemePartSize() doesn't seem to
|
| // return good values here.)
|
| @@ -525,7 +525,7 @@
|
| RECT* value_rect,
|
| bool determinate,
|
| double animated_seconds,
|
| - skia::PlatformCanvas* canvas) const {
|
| + SkCanvas* canvas) const {
|
| // There is no documentation about the animation speed, frame-rate, nor
|
| // size of moving overlay of the indeterminate progress bar.
|
| // So we just observed real-world programs and guessed following parameters.
|
|
|