| Index: ui/base/native_theme/native_theme.h
|
| diff --git a/ui/gfx/native_theme.h b/ui/base/native_theme/native_theme.h
|
| similarity index 95%
|
| rename from ui/gfx/native_theme.h
|
| rename to ui/base/native_theme/native_theme.h
|
| index 2a83dbaeacdb1455db1e4b4be54c596decf0e646..b37b1e7cef895a0c82bafac931762966f8a30396 100644
|
| --- a/ui/gfx/native_theme.h
|
| +++ b/ui/base/native_theme/native_theme.h
|
| @@ -2,8 +2,8 @@
|
| // 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_H_
|
| -#define UI_GFX_NATIVE_THEME_H_
|
| +#ifndef UI_BASE_NATIVE_THEME_NATIVE_THEME_H_
|
| +#define UI_BASE_NATIVE_THEME_NATIVE_THEME_H_
|
| #pragma once
|
|
|
| #include "third_party/skia/include/core/SkColor.h"
|
| @@ -13,9 +13,11 @@
|
| class SkCanvas;
|
|
|
| namespace gfx {
|
| -
|
| class Rect;
|
| class Size;
|
| +}
|
| +
|
| +namespace ui {
|
|
|
| // This class supports drawing UI controls (like buttons, text fields, lists,
|
| // comboboxes, etc) that look like the native UI controls of the underlying
|
| @@ -198,9 +200,9 @@ class UI_EXPORT NativeTheme {
|
| };
|
|
|
| // Return the size of the part.
|
| - virtual Size GetPartSize(Part part,
|
| - State state,
|
| - const ExtraParams& extra) const = 0;
|
| + virtual gfx::Size GetPartSize(Part part,
|
| + State state,
|
| + const ExtraParams& extra) const = 0;
|
|
|
| // Paint the part to the canvas.
|
| virtual void Paint(SkCanvas* canvas,
|
| @@ -266,6 +268,6 @@ class UI_EXPORT NativeTheme {
|
| DISALLOW_COPY_AND_ASSIGN(NativeTheme);
|
| };
|
|
|
| -} // namespace gfx
|
| +} // namespace ui
|
|
|
| -#endif // UI_GFX_NATIVE_THEME_H_
|
| +#endif // UI_BASE_NATIVE_THEME_NATIVE_THEME_H_
|
|
|