diff options
| author | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-21 00:54:15 +0000 |
|---|---|---|
| committer | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-21 00:54:15 +0000 |
| commit | 6c9280ab81b854289f65fe4580aa756d86aec9fd (patch) | |
| tree | 8ddc4e65570084db681f7898d91d477e2bd75e44 /ui/views/window | |
| parent | d5db7b226c885ff5541cb8a3ae7b37494897d33b (diff) | |
| download | chromium_src-6c9280ab81b854289f65fe4580aa756d86aec9fd.zip chromium_src-6c9280ab81b854289f65fe4580aa756d86aec9fd.tar.gz chromium_src-6c9280ab81b854289f65fe4580aa756d86aec9fd.tar.bz2 | |
Removing GTK code from ui/views.
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9804001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127852 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/window')
| -rw-r--r-- | ui/views/window/dialog_client_view.cc | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/ui/views/window/dialog_client_view.cc b/ui/views/window/dialog_client_view.cc index 264908f..8c9d9f8 100644 --- a/ui/views/window/dialog_client_view.cc +++ b/ui/views/window/dialog_client_view.cc @@ -10,8 +10,6 @@ #include <windows.h> #include <uxtheme.h> #include <vsstyle.h> -#elif defined(TOOLKIT_USES_GTK) -#include <gtk/gtk.h> #endif #include <algorithm> @@ -24,18 +22,13 @@ #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/views/controls/button/text_button.h" #include "ui/views/layout/layout_constants.h" #include "ui/views/widget/root_view.h" #include "ui/views/widget/widget.h" #include "ui/views/window/dialog_delegate.h" -#if defined(OS_WIN) -#include "ui/gfx/native_theme.h" -#else -#include "ui/gfx/skia_utils_gtk.h" -#endif - namespace views { namespace { @@ -312,19 +305,8 @@ const DialogClientView* DialogClientView::AsDialogClientView() const { // DialogClientView, View overrides: void DialogClientView::OnPaint(gfx::Canvas* canvas) { -#if defined(TOOLKIT_USES_GTK) - // TODO(benrg): Unfortunately, GetSystemColor often returns the wrong color - // under GTK right now. This is meant to be a temporary fix. See related TODO - // in ui/gfx/native_theme_gtk.cc. - GtkWidget* widget = GetWidget()->GetNativeView(); - if (!GTK_IS_WINDOW(widget)) - return; - SkColor bg_color = gfx::GdkColorToSkColor( - gtk_widget_get_style(widget)->bg[GTK_STATE_NORMAL]); -#else SkColor bg_color = gfx::NativeTheme::instance()->GetSystemColor( gfx::NativeTheme::kColorId_DialogBackground); -#endif canvas->FillRect(GetLocalBounds(), bg_color); } |