From f78452fc691fd36f44b13fa1443a6c002183cb58 Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Tue, 15 May 2012 02:07:52 +0000 Subject: ui: Move NativeTheme files into ui/base/native_theme/ directory. BUG=103304,125844 R=ben@chromium.org TBR=tony@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=136996 Review URL: https://chromiumcodereview.appspot.com/10310136 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137056 0039d316-1c4b-4281-b951-d872f2087c98 --- ui/views/examples/native_theme_button_example.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'ui/views/examples/native_theme_button_example.h') diff --git a/ui/views/examples/native_theme_button_example.h b/ui/views/examples/native_theme_button_example.h index e77038e..2bc940c 100644 --- a/ui/views/examples/native_theme_button_example.h +++ b/ui/views/examples/native_theme_button_example.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "ui/gfx/native_theme.h" +#include "ui/base/native_theme/native_theme.h" #include "ui/views/controls/button/custom_button.h" #include "ui/views/controls/combobox/combobox_listener.h" #include "ui/views/examples/example_base.h" @@ -45,17 +45,17 @@ class ExampleNativeThemeButton : public CustomButton, virtual void OnSelectedIndexChanged(Combobox* combobox) OVERRIDE; // Overridden from NativeThemeDelegate: - virtual gfx::NativeTheme::Part GetThemePart() const OVERRIDE; + virtual ui::NativeTheme::Part GetThemePart() const OVERRIDE; virtual gfx::Rect GetThemePaintRect() const OVERRIDE; - virtual gfx::NativeTheme::State GetThemeState( - gfx::NativeTheme::ExtraParams* params) const OVERRIDE; + virtual ui::NativeTheme::State GetThemeState( + ui::NativeTheme::ExtraParams* params) const OVERRIDE; virtual const ui::Animation* GetThemeAnimation() const OVERRIDE; - virtual gfx::NativeTheme::State GetBackgroundThemeState( - gfx::NativeTheme::ExtraParams* params) const OVERRIDE; - virtual gfx::NativeTheme::State GetForegroundThemeState( - gfx::NativeTheme::ExtraParams* params) const OVERRIDE; + virtual ui::NativeTheme::State GetBackgroundThemeState( + ui::NativeTheme::ExtraParams* params) const OVERRIDE; + virtual ui::NativeTheme::State GetForegroundThemeState( + ui::NativeTheme::ExtraParams* params) const OVERRIDE; - void GetExtraParams(gfx::NativeTheme::ExtraParams* params) const; + void GetExtraParams(ui::NativeTheme::ExtraParams* params) const; scoped_ptr painter_; Combobox* cb_part_; -- cgit v1.1