summaryrefslogtreecommitdiffstats
path: root/views/controls
diff options
context:
space:
mode:
Diffstat (limited to 'views/controls')
-rw-r--r--views/controls/tabbed_pane/native_tabbed_pane_gtk.cc6
-rw-r--r--views/controls/textfield/native_textfield_gtk.cc8
2 files changed, 7 insertions, 7 deletions
diff --git a/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc b/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc
index 110a688..ffdeb5e 100644
--- a/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc
+++ b/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 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.
@@ -8,11 +8,11 @@
#include "app/gfx/canvas.h"
#include "app/gfx/font.h"
+#include "app/gfx/skia_utils_gtk.h"
#include "app/resource_bundle.h"
#include "base/logging.h"
#include "base/stl_util-inl.h"
#include "base/string_util.h"
-#include "skia/ext/skia_utils_gtk.h"
#include "views/background.h"
#include "views/controls/tabbed_pane/tabbed_pane.h"
#include "views/fill_layout.h"
@@ -145,7 +145,7 @@ void NativeTabbedPaneGtk::DoAddTabAtIndex(int index, const std::wstring& title,
gtk_widget_get_style(page_container->GetNativeView());
contents->set_background(
Background::CreateSolidBackground(
- skia::GdkColorToSkColor(window_style->bg[GTK_STATE_NORMAL])));
+ gfx::GdkColorToSkColor(window_style->bg[GTK_STATE_NORMAL])));
}
GtkWidget* page = page_container->GetNativeView();
diff --git a/views/controls/textfield/native_textfield_gtk.cc b/views/controls/textfield/native_textfield_gtk.cc
index 026a6b7..e3732b5 100644
--- a/views/controls/textfield/native_textfield_gtk.cc
+++ b/views/controls/textfield/native_textfield_gtk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 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.
@@ -8,8 +8,8 @@
#include "app/gfx/insets.h"
#include "app/gfx/gtk_util.h"
+#include "app/gfx/skia_utils_gtk.h"
#include "base/string_util.h"
-#include "skia/ext/skia_utils_gtk.h"
#include "views/controls/textfield/textfield.h"
namespace views {
@@ -97,7 +97,7 @@ void NativeTextfieldGtk::UpdateTextColor() {
gtk_widget_modify_text(native_view(), GTK_STATE_NORMAL, NULL);
return;
}
- GdkColor gdk_color = skia::SkColorToGdkColor(textfield_->text_color());
+ GdkColor gdk_color = gfx::SkColorToGdkColor(textfield_->text_color());
gtk_widget_modify_text(native_view(), GTK_STATE_NORMAL, &gdk_color);
}
@@ -108,7 +108,7 @@ void NativeTextfieldGtk::UpdateBackgroundColor() {
gtk_widget_modify_base(native_view(), GTK_STATE_NORMAL, NULL);
return;
}
- GdkColor gdk_color = skia::SkColorToGdkColor(textfield_->background_color());
+ GdkColor gdk_color = gfx::SkColorToGdkColor(textfield_->background_color());
gtk_widget_modify_base(native_view(), GTK_STATE_NORMAL, &gdk_color);
}