retry 160232

chrome/browser/ui/gtk/constrained_window_gtk.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/gtk/constrained_window_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include "base/bind.h"
 #include "base/message_loop.h"
@@ skipping 39 matching lines @@
   GtkWidget* frame = gtk_frame_new(NULL);
   gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_OUT);
 
   GtkWidget* alignment = gtk_alignment_new(0.0, 0.0, 1.0, 1.0);
   if (delegate->ShouldHaveBorderPadding()) {
     gtk_alignment_set_padding(GTK_ALIGNMENT(alignment),
         ui::kContentAreaBorder, ui::kContentAreaBorder,
         ui::kContentAreaBorder, ui::kContentAreaBorder);
   }
 
-  GdkColor background;
-  if (delegate->GetBackgroundColor(&background)) {
-    gtk_widget_modify_base(ebox, GTK_STATE_NORMAL, &background);
-    gtk_widget_modify_fg(ebox, GTK_STATE_NORMAL, &background);
-    gtk_widget_modify_bg(ebox, GTK_STATE_NORMAL, &background);
-  }
-
   if (gtk_widget_get_parent(dialog))
     gtk_widget_reparent(dialog, alignment);
   else
     gtk_container_add(GTK_CONTAINER(alignment), dialog);
 
   gtk_container_add(GTK_CONTAINER(frame), alignment);
   gtk_container_add(GTK_CONTAINER(ebox), frame);
   border_.Own(ebox);
 
+  BackgroundColorChanged();

[Evan Stade, 2012/10/05 09:04:51]

the fix was moving this below L67.

+
   gtk_widget_add_events(widget(), GDK_KEY_PRESS_MASK);
   g_signal_connect(widget(), "key-press-event", G_CALLBACK(OnKeyPressThunk),
                    this);
   g_signal_connect(widget(), "hierarchy-changed",
                    G_CALLBACK(OnHierarchyChangedThunk), this);
 
   ConstrainedWindowTabHelper* constrained_window_tab_helper =
       ConstrainedWindowTabHelper::FromWebContents(
           tab_contents_->web_contents());
   constrained_window_tab_helper->AddConstrainedDialog(this);
@@ skipping 37 matching lines @@
           tab_contents_->web_contents());
   if ((!helper->delegate() ||
        helper->delegate()->ShouldFocusConstrainedWindow()) &&
       gtk_util::IsWidgetAncestryVisible(focus_widget)) {
     gtk_widget_grab_focus(focus_widget);
   } else {
     ContainingView()->focus_store()->SetWidget(focus_widget);
   }
 }
 
+void ConstrainedWindowGtk::BackgroundColorChanged() {
+  GdkColor background;
+  if (delegate_->GetBackgroundColor(&background)) {
+    gtk_widget_modify_base(border_.get(), GTK_STATE_NORMAL, &background);
+    gtk_widget_modify_fg(border_.get(), GTK_STATE_NORMAL, &background);
+    gtk_widget_modify_bg(border_.get(), GTK_STATE_NORMAL, &background);
+  }
+}
+
 ConstrainedWindowGtk::TabContentsViewType*
     ConstrainedWindowGtk::ContainingView() {
   return
       ChromeWebContentsViewDelegateGtk::GetFor(tab_contents_->web_contents());
 }
 
 gboolean ConstrainedWindowGtk::OnKeyPress(GtkWidget* sender,
                                           GdkEventKey* key) {
   if (key->keyval == GDK_Escape) {
     // Let the stack unwind so the event handler can release its ref
     // on widget().
     MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(&ConstrainedWindowGtk::CloseConstrainedWindow,
                    weak_factory_.GetWeakPtr()));
     return TRUE;
   }
 
   return FALSE;
 }
 
 void ConstrainedWindowGtk::OnHierarchyChanged(GtkWidget* sender,
                                               GtkWidget* previous_toplevel) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (!gtk_widget_is_toplevel(gtk_widget_get_toplevel(widget())))
     return;
 
   FocusConstrainedWindow();
 }