From 2627431bef905332e55a90960aed8049b681689f Mon Sep 17 00:00:00 2001
From: "sky@chromium.org"
 <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 15 Sep 2009 20:21:53 +0000
Subject: Lands http://codereview.chromium.org/193032 for Charlie:

First pass at adding ChromeOS settings
- a mock wifi selector combobox
- touchpad settings that makes calls to synclient
- on startup, touchpad settings are initialized to what's stored in
preferences

TEST=none
BUG=none

Review URL: http://codereview.chromium.org/203073

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26259 0039d316-1c4b-4281-b951-d872f2087c98
---
 views/window/dialog_client_view.cc | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'views/window')

diff --git a/views/window/dialog_client_view.cc b/views/window/dialog_client_view.cc
index 98482a0..5261679 100644
--- a/views/window/dialog_client_view.cc
+++ b/views/window/dialog_client_view.cc
@@ -4,26 +4,30 @@
 
 #include "views/window/dialog_client_view.h"
 
+#if defined(OS_WIN)
+#include <windows.h>
+#include <uxtheme.h>
+#include <vsstyle.h>
+#else
+#include <gtk/gtk.h>
+#endif
+
+#include <algorithm>
+
 #include "app/gfx/canvas.h"
 #include "app/gfx/font.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"
 #include "views/window/window.h"
-
 #if defined(OS_WIN)
-#include <windows.h>
-#include <uxtheme.h>
-#include <vsstyle.h>
-
 #include "base/gfx/native_theme.h"
 #else
-#include <gtk/gtk.h>
-
 #include "views/window/hit_test.h"
 #include "views/widget/widget.h"
 #endif
@@ -274,9 +278,8 @@ 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(SkColorSetRGB(window_style->bg[GTK_STATE_NORMAL].red,
-                                      window_style->bg[GTK_STATE_NORMAL].green,
-                                      window_style->bg[GTK_STATE_NORMAL].blue),
+    canvas->FillRectInt(skia::GdkColorToSkColor(
+                            window_style->bg[GTK_STATE_NORMAL]),
                         0, 0, width(), height());
   }
 #endif
-- 
cgit v1.1