Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1192)

Unified Diff: ui/base/native_theme/native_theme_android.h

Issue 10310136: ui: Move NativeTheme files into ui/base/native_theme/ directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/native_theme/native_theme.cc ('k') | ui/base/native_theme/native_theme_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_
« no previous file with comments | « ui/base/native_theme/native_theme.cc ('k') | ui/base/native_theme/native_theme_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698