Remove DialogDelegate::UseNewStyle and unused code.

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/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/views/constrained_window_views.h"
 #include "components/web_modal/web_contents_modal_dialog_host.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "components/web_modal/web_contents_modal_dialog_manager_delegate.h"
 #include "content/public/browser/web_contents.h"
-#include "content/public/browser/web_contents_view.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/resource/resource_bundle.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/scroll_view.h"
 #include "ui/views/controls/separator.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
@@ skipping 54 matching lines @@
   // Ownership of |contents_| is handed off by this call. |window_| will take
   // care of deleting itself after calling DeleteDelegate().
   WebContentsModalDialogManager* web_contents_modal_dialog_manager =
       WebContentsModalDialogManager::FromWebContents(
           controller->web_contents());
   DCHECK(web_contents_modal_dialog_manager);
   WebContentsModalDialogManagerDelegate* modal_delegate =
       web_contents_modal_dialog_manager->delegate();
   DCHECK(modal_delegate);
   window_ = views::Widget::CreateWindowAsFramelessChild(
-      this,
-      controller->web_contents()->GetView()->GetNativeView(),
-      modal_delegate->GetWebContentsModalDialogHost()->GetHostView());
+      this, modal_delegate->GetWebContentsModalDialogHost()->GetHostView());
   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 = 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);
 
-  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->StartRow(0, column_set_id);
   layout->AddView(
       subtext, 1, 1,
       views::GridLayout::FILL, views::GridLayout::LEADING,
       dialog_content_width, subtext->GetHeightForWidth(dialog_content_width));
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
@@ skipping 134 matching lines @@
   else
     new_checkbox_map_[checkbox] = gallery;
 
   return true;
 }
 
 string16 MediaGalleriesDialogViews::GetWindowTitle() const {
   return controller_->GetHeader();
 }
 
-bool MediaGalleriesDialogViews::ShouldShowWindowTitle() const {
-  return DialogDelegate::UseNewStyle();
-}
-
 void MediaGalleriesDialogViews::DeleteDelegate() {
   controller_->DialogFinished(accepted_);
 }
 
 views::Widget* MediaGalleriesDialogViews::GetWidget() {
   return contents_->GetWidget();
 }
 
 const views::Widget* MediaGalleriesDialogViews::GetWidget() const {
   return contents_->GetWidget();
@@ skipping 104 matching lines @@
   }
 }
 
 // MediaGalleriesDialogViewsController -----------------------------------------
 
 // static
 MediaGalleriesDialog* MediaGalleriesDialog::Create(
     MediaGalleriesDialogController* controller) {
   return new MediaGalleriesDialogViews(controller);
 }