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

Unified Diff: ui/views/native_theme_painter.cc

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/views/native_theme_delegate.h ('k') | ui/views/widget/native_widget_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/native_theme_painter.cc
diff --git a/ui/views/native_theme_painter.cc b/ui/views/native_theme_painter.cc
index 454ed3d9c6838a24b7b3e1e23c62a1cf3eb773a3..8acb532b21212526ae15741d747f6db4a34cee7c 100644
--- a/ui/views/native_theme_painter.cc
+++ b/ui/views/native_theme_painter.cc
@@ -18,36 +18,36 @@ NativeThemePainter::NativeThemePainter(NativeThemeDelegate* delegate)
}
gfx::Size NativeThemePainter::GetPreferredSize() {
- const gfx::NativeTheme* theme = gfx::NativeTheme::instance();
- gfx::NativeTheme::ExtraParams extra;
- gfx::NativeTheme::State state = delegate_->GetThemeState(&extra);
+ const ui::NativeTheme* theme = ui::NativeTheme::instance();
+ ui::NativeTheme::ExtraParams extra;
+ ui::NativeTheme::State state = delegate_->GetThemeState(&extra);
return theme->GetPartSize(delegate_->GetThemePart(), state, extra);
}
void NativeThemePainter::Paint(gfx::Canvas* canvas, const gfx::Size& size) {
- const gfx::NativeTheme* native_theme = gfx::NativeTheme::instance();
- gfx::NativeTheme::Part part = delegate_->GetThemePart();
+ const ui::NativeTheme* native_theme = ui::NativeTheme::instance();
+ ui::NativeTheme::Part part = delegate_->GetThemePart();
gfx::Rect rect(size);
if (delegate_->GetThemeAnimation() != NULL &&
delegate_->GetThemeAnimation()->is_animating()) {
// Paint background state.
- gfx::NativeTheme::ExtraParams prev_extra;
- gfx::NativeTheme::State prev_state =
+ ui::NativeTheme::ExtraParams prev_extra;
+ ui::NativeTheme::State prev_state =
delegate_->GetBackgroundThemeState(&prev_extra);
native_theme->Paint(canvas->sk_canvas(), part, prev_state, rect,
prev_extra);
// Composite foreground state above it.
- gfx::NativeTheme::ExtraParams extra;
- gfx::NativeTheme::State state = delegate_->GetForegroundThemeState(&extra);
+ ui::NativeTheme::ExtraParams extra;
+ ui::NativeTheme::State state = delegate_->GetForegroundThemeState(&extra);
int alpha = delegate_->GetThemeAnimation()->CurrentValueBetween(0, 255);
canvas->SaveLayerAlpha(static_cast<uint8>(alpha));
native_theme->Paint(canvas->sk_canvas(), part, state, rect, extra);
canvas->Restore();
} else {
- gfx::NativeTheme::ExtraParams extra;
- gfx::NativeTheme::State state = delegate_->GetThemeState(&extra);
+ ui::NativeTheme::ExtraParams extra;
+ ui::NativeTheme::State state = delegate_->GetThemeState(&extra);
native_theme->Paint(canvas->sk_canvas(), part, state, rect, extra);
}
}
« no previous file with comments | « ui/views/native_theme_delegate.h ('k') | ui/views/widget/native_widget_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698