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

Unified Diff: ui/views/native_theme_delegate.h

Issue 10387121: Revert 136996 - ui: Move NativeTheme files into ui/base/native_theme/ directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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/views/examples/native_theme_checkbox_example.h ('k') | ui/views/native_theme_painter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/native_theme_delegate.h
===================================================================
--- ui/views/native_theme_delegate.h (revision 137002)
+++ ui/views/native_theme_delegate.h (working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
@@ -6,7 +6,7 @@
#define UI_VIEWS_NATIVE_THEME_DELEGATE_H_
#pragma once
-#include "ui/base/native_theme/native_theme.h"
+#include "ui/gfx/native_theme.h"
#include "ui/gfx/rect.h"
#include "ui/views/views_export.h"
@@ -24,28 +24,28 @@
virtual ~NativeThemeDelegate() {}
// Get the native theme part that should be drawn.
- virtual ui::NativeTheme::Part GetThemePart() const = 0;
+ virtual gfx::NativeTheme::Part GetThemePart() const = 0;
// Get the rectangle that should be painted.
virtual gfx::Rect GetThemePaintRect() const = 0;
// Get the state of the part, along with any extra data needed for drawing.
- virtual ui::NativeTheme::State GetThemeState(
- ui::NativeTheme::ExtraParams* params) const = 0;
+ virtual gfx::NativeTheme::State GetThemeState(
+ gfx::NativeTheme::ExtraParams* params) const = 0;
// If the native theme drawign should be animated, return the Animation object
// that controlls it. If no animation is ongoing, NULL may be returned.
virtual const ui::Animation* GetThemeAnimation() const = 0;
// If animation is onging, this returns the background native theme state.
- virtual ui::NativeTheme::State GetBackgroundThemeState(
- ui::NativeTheme::ExtraParams* params) const = 0;
+ virtual gfx::NativeTheme::State GetBackgroundThemeState(
+ gfx::NativeTheme::ExtraParams* params) const = 0;
// If animation is onging, this returns the foreground native theme state.
// This state will be composited over the background using an alpha value
// based on the current value of the animation.
- virtual ui::NativeTheme::State GetForegroundThemeState(
- ui::NativeTheme::ExtraParams* params) const = 0;
+ virtual gfx::NativeTheme::State GetForegroundThemeState(
+ gfx::NativeTheme::ExtraParams* params) const = 0;
};
} // namespace views
« no previous file with comments | « ui/views/examples/native_theme_checkbox_example.h ('k') | ui/views/native_theme_painter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698