summaryrefslogtreecommitdiffstats
path: root/views/window
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-26 00:47:59 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-26 00:47:59 +0000
commitad02174ccfde818097757bef93c9ae6ea62c68bd (patch)
tree3d7190ae70d55bec354bab112ee6bcbcad7e29ad /views/window
parent05af3561d9685d9b54e4d2e4fe35b2c69bd6bec0 (diff)
downloadchromium_src-ad02174ccfde818097757bef93c9ae6ea62c68bd.zip
chromium_src-ad02174ccfde818097757bef93c9ae6ea62c68bd.tar.gz
chromium_src-ad02174ccfde818097757bef93c9ae6ea62c68bd.tar.bz2
Move skia_utils_gtk.cc/.h to app/gfx/. Original patch by Thiago Farina (see http://codereview.chromium.org/660063 ), r=me.
BUG=22853 TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40083 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/window')
-rw-r--r--views/window/dialog_client_view.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/views/window/dialog_client_view.cc b/views/window/dialog_client_view.cc
index 3eac93c..f54ae32 100644
--- a/views/window/dialog_client_view.cc
+++ b/views/window/dialog_client_view.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -16,11 +16,11 @@
#include "app/gfx/canvas.h"
#include "app/gfx/font.h"
+#include "app/gfx/skia_utils_gtk.h"
#include "app/l10n_util.h"
#include "app/resource_bundle.h"
#include "base/keyboard_codes.h"
#include "grit/app_strings.h"
-#include "skia/ext/skia_utils_gtk.h"
#include "views/controls/button/native_button.h"
#include "views/standard_layout.h"
#include "views/window/dialog_delegate.h"
@@ -300,7 +300,7 @@ void DialogClientView::Paint(gfx::Canvas* canvas) {
GtkWidget* widget = GetWidget()->GetNativeView();
if (GTK_IS_WINDOW(widget)) {
GtkStyle* window_style = gtk_widget_get_style(widget);
- canvas->FillRectInt(skia::GdkColorToSkColor(
+ canvas->FillRectInt(gfx::GdkColorToSkColor(
window_style->bg[GTK_STATE_NORMAL]),
0, 0, width(), height());
}