| Index: ui/base/native_theme/native_theme_android.h
|
| diff --git a/ui/gfx/native_theme_android.h b/ui/base/native_theme/native_theme_android.h
|
| similarity index 92%
|
| rename from ui/gfx/native_theme_android.h
|
| rename to ui/base/native_theme/native_theme_android.h
|
| index 800c320d0cce372e2ead6c5efbd03d2a5a87842b..601a4f8f26250bba9edb4ad8ac2ff1bc40d84d10 100644
|
| --- a/ui/gfx/native_theme_android.h
|
| +++ b/ui/base/native_theme/native_theme_android.h
|
| @@ -2,17 +2,21 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef UI_GFX_NATIVE_THEME_ANDROID_H_
|
| -#define UI_GFX_NATIVE_THEME_ANDROID_H_
|
| +#ifndef UI_BASE_NATIVE_THEME_NATIVE_THEME_ANDROID_H_
|
| +#define UI_BASE_NATIVE_THEME_NATIVE_THEME_ANDROID_H_
|
| +#pragma once
|
|
|
| #include "base/basictypes.h"
|
| #include "base/compiler_specific.h"
|
| #include "skia/ext/platform_canvas.h"
|
| -#include "ui/gfx/native_theme.h"
|
| +#include "ui/base/native_theme/native_theme.h"
|
|
|
| namespace gfx {
|
| class Rect;
|
| class Size;
|
| +}
|
| +
|
| +namespace ui {
|
|
|
| // Android theming API.
|
| class NativeThemeAndroid : public NativeTheme {
|
| @@ -21,9 +25,9 @@ class NativeThemeAndroid : public NativeTheme {
|
| static const NativeThemeAndroid* instance();
|
|
|
| // Return the size of the part.
|
| - virtual Size GetPartSize(Part part,
|
| - State state,
|
| - const ExtraParams& extra) const OVERRIDE;
|
| + virtual gfx::Size GetPartSize(Part part,
|
| + State state,
|
| + const ExtraParams& extra) const OVERRIDE;
|
|
|
| // Paint the part to the canvas.
|
| virtual void Paint(SkCanvas* canvas,
|
| @@ -167,6 +171,6 @@ class NativeThemeAndroid : public NativeTheme {
|
| DISALLOW_COPY_AND_ASSIGN(NativeThemeAndroid);
|
| };
|
|
|
| -} // namespace gfx
|
| +} // namespace ui
|
|
|
| -#endif // UI_GFX_NATIVE_THEME_ANDROID_H_
|
| +#endif // UI_BASE_NATIVE_THEME_NATIVE_THEME_ANDROID_H_
|
|
|