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

Unified Diff: ui/views/window/dialog_client_view.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/widget/native_widget_win.cc ('k') | webkit/glue/webthemeengine_impl_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/window/dialog_client_view.cc
diff --git a/ui/views/window/dialog_client_view.cc b/ui/views/window/dialog_client_view.cc
index 8c9d9f8c5407d4fddad601e7e28f1fa87fb4a6b3..e7436ca2eb55b57a8f1c81b3b2f68f9244bb18fa 100644
--- a/ui/views/window/dialog_client_view.cc
+++ b/ui/views/window/dialog_client_view.cc
@@ -22,7 +22,7 @@
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/font.h"
-#include "ui/gfx/native_theme.h"
+#include "ui/base/native_theme/native_theme.h"
#include "ui/views/controls/button/text_button.h"
#include "ui/views/layout/layout_constants.h"
#include "ui/views/widget/root_view.h"
@@ -305,8 +305,8 @@ const DialogClientView* DialogClientView::AsDialogClientView() const {
// DialogClientView, View overrides:
void DialogClientView::OnPaint(gfx::Canvas* canvas) {
- SkColor bg_color = gfx::NativeTheme::instance()->GetSystemColor(
- gfx::NativeTheme::kColorId_DialogBackground);
+ SkColor bg_color = ui::NativeTheme::instance()->GetSystemColor(
+ ui::NativeTheme::kColorId_DialogBackground);
canvas->FillRect(GetLocalBounds(), bg_color);
}
@@ -420,10 +420,9 @@ void DialogClientView::PaintSizeBox(gfx::Canvas* canvas) {
if (GetWidget()->widget_delegate()->CanResize() ||
GetWidget()->widget_delegate()->CanMaximize()) {
#if defined(OS_WIN)
- gfx::NativeTheme::ExtraParams extra;
- gfx::Size gripper_size = gfx::NativeTheme::instance()->GetPartSize(
- gfx::NativeTheme::kWindowResizeGripper, gfx::NativeTheme::kNormal,
- extra);
+ ui::NativeTheme::ExtraParams extra;
+ gfx::Size gripper_size = ui::NativeTheme::instance()->GetPartSize(
+ ui::NativeTheme::kWindowResizeGripper, ui::NativeTheme::kNormal, extra);
// TODO(beng): (http://b/1085509) In "classic" rendering mode, there isn't
// a theme-supplied gripper. We should probably improvise
@@ -433,11 +432,11 @@ void DialogClientView::PaintSizeBox(gfx::Canvas* canvas) {
size_box_bounds_.set_x(size_box_bounds_.right() - gripper_size.width());
size_box_bounds_.set_y(size_box_bounds_.bottom() - gripper_size.height());
- gfx::NativeTheme::instance()->Paint(canvas->sk_canvas(),
- gfx::NativeTheme::kWindowResizeGripper,
- gfx::NativeTheme::kNormal,
- size_box_bounds_,
- extra);
+ ui::NativeTheme::instance()->Paint(canvas->sk_canvas(),
+ ui::NativeTheme::kWindowResizeGripper,
+ ui::NativeTheme::kNormal,
+ size_box_bounds_,
+ extra);
#else
NOTIMPLEMENTED();
// TODO(port): paint size box
« no previous file with comments | « ui/views/widget/native_widget_win.cc ('k') | webkit/glue/webthemeengine_impl_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698