fix GridLayout::CreatePanel for new style dialogs

chrome/browser/ui/views/extensions/media_galleries_dialog_views.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/views/extensions/media_galleries_dialog_views.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/views/constrained_window_views.h"
 #include "chrome/browser/ui/web_contents_modal_dialog_manager.h"
 #include "chrome/browser/ui/web_contents_modal_dialog_manager_delegate.h"
@@ skipping 83 matching lines @@
   web_contents_modal_dialog_manager->ShowDialog(window_->GetNativeView());
 }
 
 MediaGalleriesDialogViews::~MediaGalleriesDialogViews() {}
 
 void MediaGalleriesDialogViews::InitChildViews() {
   // Outer dialog layout.
   contents_->RemoveAllChildViews(true);
   int dialog_content_width = views::Widget::GetLocalizedContentsWidth(
       IDS_MEDIA_GALLERIES_DIALOG_CONTENT_WIDTH_CHARS);
-  views::GridLayout* layout = new views::GridLayout(contents_);
-  layout->SetInsets(views::kPanelVertMargin, views::kPanelHorizMargin,
-                    0, views::kPanelHorizMargin);
+  views::GridLayout* layout = views::GridLayout::CreatePanel(contents_);
+  contents_->SetLayoutManager(layout);
 
   int column_set_id = 0;
   views::ColumnSet* columns = layout->AddColumnSet(column_set_id);
   columns->AddColumn(views::GridLayout::LEADING,
                      views::GridLayout::LEADING,
                      1,
                      views::GridLayout::FIXED,
                      dialog_content_width,
                      0);
-  contents_->SetLayoutManager(layout);
-  contents_->set_border(views::Border::CreateEmptyBorder(
-      views::kPanelSubVerticalSpacing,
-      0,
-      views::kPanelSubVerticalSpacing,
-      0));
 
-  // Header text.
-  views::Label* header = new views::Label(controller_->GetHeader());
-  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  header->SetFont(rb.GetFont(ui::ResourceBundle::MediumFont));
-  header->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-  layout->StartRow(0, column_set_id);
-  layout->AddView(header);
+  if (!DialogDelegate::UseNewStyle()) {
+    // Header text.
+    views::Label* header = new views::Label(controller_->GetHeader());
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+    header->SetFont(rb.GetFont(ui::ResourceBundle::MediumFont));
+    header->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+    layout->StartRow(0, column_set_id);
+    layout->AddView(header);
+  }
 
   // Message text.
   views::Label* subtext = new views::Label(controller_->GetSubtext());
   subtext->SetMultiLine(true);
   subtext->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   layout->StartRowWithPadding(0, column_set_id,
                               0, views::kRelatedControlVerticalSpacing);
   layout->AddView(subtext);
 
   // Scrollable area for checkboxes.
@@ skipping 164 matching lines @@
   checkbox_map_[gallery] = checkbox;
 
   return true;
 }
 
 string16 MediaGalleriesDialogViews::GetWindowTitle() const {
   return controller_->GetHeader();
 }
 
 bool MediaGalleriesDialogViews::ShouldShowWindowTitle() const {
-  return false;
+  return DialogDelegate::UseNewStyle();

[msw, 2013/04/16 01:58:24]

I don't think this matters (not checked in DialogDelegate's BubbleFrameView).

[Evan Stade, 2013/04/16 19:58:25]

regardless, it seems correct, and is less confusing than what was there before.

 }
 
 void MediaGalleriesDialogViews::DeleteDelegate() {
   controller_->DialogFinished(accepted_);
 }
 
 views::Widget* MediaGalleriesDialogViews::GetWidget() {
   return contents_->GetWidget();
 }
 
@@ skipping 65 matching lines @@
 
 // MediaGalleriesDialogViewsController -----------------------------------------
 
 // static
 MediaGalleriesDialog* MediaGalleriesDialog::Create(
     MediaGalleriesDialogController* controller) {
   return new MediaGalleriesDialogViews(controller);
 }
 
 }  // namespace chrome