Chromium Code Reviews| Index: chrome/browser/ui/gtk/constrained_window_gtk.cc |
| diff --git a/chrome/browser/ui/gtk/constrained_window_gtk.cc b/chrome/browser/ui/gtk/constrained_window_gtk.cc |
| index 2a454ce238bfa0543bd99937ddabd580fd6e2b65..5b054d5e95ee84da359f0fbdc18e6961a3100451 100644 |
| --- a/chrome/browser/ui/gtk/constrained_window_gtk.cc |
| +++ b/chrome/browser/ui/gtk/constrained_window_gtk.cc |
| @@ -10,6 +10,7 @@ |
| #include "chrome/browser/ui/gtk/gtk_util.h" |
| #include "content/browser/browser_thread.h" |
| #include "content/browser/tab_contents/tab_contents.h" |
| +#include "ui/gfx/insets.h" |
|
oshima
2011/03/10 17:46:11
this is no longer necessary, right?
xiyuan
2011/03/10 17:54:50
That's right. Removed.
|
| #if defined(TOUCH_UI) |
| #include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h" |
| @@ -24,6 +25,10 @@ bool ConstrainedWindowGtkDelegate::GetBackgroundColor(GdkColor* color) { |
| return false; |
| } |
| +bool ConstrainedWindowGtkDelegate::ShouldHaveBorderPadding() const { |
| + return true; |
| +} |
| + |
| ConstrainedWindowGtk::ConstrainedWindowGtk( |
| TabContents* owner, ConstrainedWindowGtkDelegate* delegate) |
| : owner_(owner), |
| @@ -41,9 +46,12 @@ ConstrainedWindowGtk::ConstrainedWindowGtk( |
| gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_OUT); |
| GtkWidget* alignment = gtk_alignment_new(0.0, 0.0, 1.0, 1.0); |
| - gtk_alignment_set_padding(GTK_ALIGNMENT(alignment), |
| - gtk_util::kContentAreaBorder, gtk_util::kContentAreaBorder, |
| - gtk_util::kContentAreaBorder, gtk_util::kContentAreaBorder); |
| + if (delegate->ShouldHaveBorderPadding()) { |
| + gtk_alignment_set_padding(GTK_ALIGNMENT(alignment), |
| + gtk_util::kContentAreaBorder, gtk_util::kContentAreaBorder, |
| + gtk_util::kContentAreaBorder, gtk_util::kContentAreaBorder); |
| + } |
| + |
| GdkColor background; |
| if (delegate->GetBackgroundColor(&background)) { |
| gtk_widget_modify_base(ebox, GTK_STATE_NORMAL, &background); |