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

Unified Diff: ui/base/native_theme/native_theme_win.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_gtk.cc ('k') | ui/base/native_theme/native_theme_win.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_win.h
diff --git a/ui/gfx/native_theme_win.h b/ui/base/native_theme/native_theme_win.h
similarity index 97%
rename from ui/gfx/native_theme_win.h
rename to ui/base/native_theme/native_theme_win.h
index 8427442d015b6738be7b97d033357539b2400b6a..260de8d08e0b5264850274c9c92c9bb863b6cba1 100644
--- a/ui/gfx/native_theme_win.h
+++ b/ui/base/native_theme/native_theme_win.h
@@ -1,29 +1,29 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-//
+
+#ifndef UI_BASE_NATIVE_THEME_NATIVE_THEME_WIN_H_
+#define UI_BASE_NATIVE_THEME_NATIVE_THEME_WIN_H_
+#pragma once
+
// A wrapper class for working with custom XP/Vista themes provided in
// uxtheme.dll. This is a singleton class that can be grabbed using
// NativeThemeWin::instance().
// For more information on visual style parts and states, see:
// http://msdn.microsoft.com/library/default.asp?url=/library/en-us/shellcc/platform/commctls/userex/topics/partsandstates.asp
-#ifndef UI_GFX_NATIVE_THEME_WIN_H_
-#define UI_GFX_NATIVE_THEME_WIN_H_
-#pragma once
-
#include <windows.h>
#include <uxtheme.h>
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "third_party/skia/include/core/SkColor.h"
-#include "ui/gfx/native_theme.h"
+#include "ui/base/native_theme/native_theme.h"
#include "ui/gfx/size.h"
class SkCanvas;
-namespace gfx {
+namespace ui {
// Windows implementation of native theme class.
//
@@ -69,7 +69,7 @@ class UI_EXPORT NativeThemeWin : public NativeTheme {
// Get the thickness of the border associated with the specified theme,
// defaulting to GetSystemMetrics edge size if themes are disabled.
// In Classic Windows, borders are typically 2px; on XP+, they are 1px.
- Size GetThemeBorderSize(ThemeName theme) const;
+ gfx::Size GetThemeBorderSize(ThemeName theme) const;
// Disables all theming for top-level windows in the entire process, from
// when this method is called until the process exits. All the other
@@ -326,6 +326,6 @@ class UI_EXPORT NativeThemeWin : public NativeTheme {
DISALLOW_COPY_AND_ASSIGN(NativeThemeWin);
};
-} // namespace gfx
+} // namespace ui
-#endif // UI_GFX_NATIVE_THEME_WIN_H_
+#endif // UI_BASE_NATIVE_THEME_NATIVE_THEME_WIN_H_
« no previous file with comments | « ui/base/native_theme/native_theme_gtk.cc ('k') | ui/base/native_theme/native_theme_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698