Add a new GetSystemColor method to native theme.

ui/views/window/dialog_client_view.cc

 // Copyright (c) 2011 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.
 
 #include "ui/views/window/dialog_client_view.h"
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <uxtheme.h>
 #include <vsstyle.h>
-#elif defined(TOOLKIT_USES_GTK)
-#include <gtk/gtk.h>
 #endif
 
 #include <algorithm>
 
 #include "base/utf_string_conversions.h"
 #include "grit/ui_strings.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 18 matching lines @@
 void UpdateButtonHelper(NativeTextButton* button_view,
                         DialogDelegate* delegate,
                         ui::DialogButton button) {
   string16 label = delegate->GetDialogButtonLabel(button);
   if (!label.empty())
     button_view->SetText(label);
   button_view->SetEnabled(delegate->IsDialogButtonEnabled(button));
   button_view->SetVisible(delegate->IsDialogButtonVisible(button));
 }
 
-#if defined(OS_WIN)
-void FillViewWithSysColor(gfx::Canvas* canvas, View* view, COLORREF color) {
-  SkColor sk_color =
-      SkColorSetRGB(GetRValue(color), GetGValue(color), GetBValue(color));
-  canvas->FillRect(sk_color, view->GetLocalBounds());
-}
-#endif
-
 // DialogButton ----------------------------------------------------------------
 
 // DialogButtons is used for the ok/cancel buttons of the window. DialogButton
 // forwards AcceleratorPressed to the delegate.
 
 class DialogButton : public NativeTextButton {
  public:
   DialogButton(ButtonListener* listener,
                Widget* owner,
                ui::DialogButton type,
@@ skipping 236 matching lines @@
 }
 
 const DialogClientView* DialogClientView::AsDialogClientView() const {
   return this;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DialogClientView, View overrides:
 
 void DialogClientView::OnPaint(gfx::Canvas* canvas) {
-#if defined(OS_WIN)
-  FillViewWithSysColor(canvas, this, GetSysColor(COLOR_3DFACE));
-#elif defined(USE_WAYLAND) || defined(USE_AURA)
-  SkColor sk_color = SkColorSetARGB(200, 255, 255, 255);
-  canvas->FillRect(sk_color, GetLocalBounds());
-#else
-  GtkWidget* widget = GetWidget()->GetNativeView();
-  if (GTK_IS_WINDOW(widget)) {
-    GtkStyle* window_style = gtk_widget_get_style(widget);
-    canvas->FillRect(gfx::GdkColorToSkColor(window_style->bg[GTK_STATE_NORMAL]),
-                     GetLocalBounds());
-  }
-#endif
+  SkColor bg_color = gfx::NativeTheme::instance()->
+                     GetSystemColor(gfx::NativeTheme::kDialogBackgroundColorId);

[Ben Goodger (Google), 2011/11/21 18:59:59]

reformat as:

gfx::NativeTheme::instance()->GetSystemColor(
    gfx::NativeTheme::kColorId_DialogBackground);
^
+-- 4 space indent for wrapped params.

[benrg, 2011/11/21 19:54:20]

Done.

+  canvas->FillRect(bg_color, GetLocalBounds());
 }
 
 void DialogClientView::PaintChildren(gfx::Canvas* canvas) {
   View::PaintChildren(canvas);
   if (!GetWidget()->IsMaximized() && !GetWidget()->IsMinimized())
     PaintSizeBox(canvas);
 }
 
 void DialogClientView::Layout() {
   if (has_dialog_buttons())
@@ skipping 242 matching lines @@
 void DialogClientView::InitClass() {
   static bool initialized = false;
   if (!initialized) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     dialog_button_font_ = new gfx::Font(rb.GetFont(ResourceBundle::BaseFont));
     initialized = true;
   }
 }
 
 }  // namespace views