Reland Fix Views web-modal dialog widget creation.

chrome/browser/ui/views/signed_certificate_timestamps_views.cc

 // Copyright 2014 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/signed_certificate_timestamps_views.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/ui/views/constrained_window_views.h"
 #include "chrome/browser/ui/views/signed_certificate_timestamp_info_view.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/notification_source.h"
 #include "content/public/browser/signed_certificate_timestamp_store.h"
 #include "content/public/common/signed_certificate_timestamp_id_and_status.h"
 #include "grit/generated_resources.h"
-#include "net/cert/signed_certificate_timestamp.h"
-#include "net/ssl/signed_certificate_timestamp_and_status.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 
-using web_modal::WebContentsModalDialogManager;
-using web_modal::WebContentsModalDialogManagerDelegate;
-using views::GridLayout;
-
 namespace {
 
 void SignedCertificateTimestampIDsToList(
     const content::SignedCertificateTimestampIDStatusList& sct_ids_list,
     net::SignedCertificateTimestampAndStatusList* sct_list) {
   for (content::SignedCertificateTimestampIDStatusList::const_iterator it =
            sct_ids_list.begin();
        it != sct_ids_list.end();
        ++it) {
     scoped_refptr<net::ct::SignedCertificateTimestamp> sct;
@@ skipping 55 matching lines @@
                                     base::IntToString16(index + 1),
                                     base::UTF8ToUTF16(origin),
                                     base::UTF8ToUTF16(status));
 }
 
 SignedCertificateTimestampsViews::SignedCertificateTimestampsViews(
     content::WebContents* web_contents,
     const net::SignedCertificateTimestampAndStatusList& sct_list)
     : sct_info_view_(NULL),
       sct_list_(sct_list) {
-  WebContentsModalDialogManager* web_contents_modal_dialog_manager =
-      WebContentsModalDialogManager::FromWebContents(web_contents);
-  WebContentsModalDialogManagerDelegate* modal_delegate =
-      web_contents_modal_dialog_manager->delegate();
-  DCHECK(modal_delegate);
-  views::Widget* window = views::Widget::CreateWindowAsFramelessChild(
-      this, modal_delegate->GetWebContentsModalDialogHost()->GetHostView());
-  web_contents_modal_dialog_manager->ShowModalDialog(
-      window->GetNativeView());
+  ShowWebModalDialogViews(this, web_contents);
 }
 
 SignedCertificateTimestampsViews::~SignedCertificateTimestampsViews() {}
 
 base::string16 SignedCertificateTimestampsViews::GetWindowTitle() const {
   return l10n_util::GetStringUTF16(IDS_SCT_VIEWER_TITLE);
 }
 
 int SignedCertificateTimestampsViews::GetDialogButtons() const {
   return ui::DIALOG_BUTTON_CANCEL;
 }
 
 ui::ModalType SignedCertificateTimestampsViews::GetModalType() const {
-#if defined(USE_ASH)
   return ui::MODAL_TYPE_CHILD;
-#else
-  return views::WidgetDelegate::GetModalType();
-#endif
 }
 
 void SignedCertificateTimestampsViews::OnPerformAction(
     views::Combobox* combobox) {
   DCHECK_EQ(combobox, sct_selector_box_.get());
   DCHECK_LT(combobox->selected_index(), sct_list_model_->GetItemCount());
   ShowSCTInfo(combobox->selected_index());
 }
 
 void SignedCertificateTimestampsViews::ViewHierarchyChanged(
     const ViewHierarchyChangedDetails& details) {
   if (details.is_add && details.child == this)
     Init();
 }
 
 void SignedCertificateTimestampsViews::Init() {
-  GridLayout* layout = GridLayout::CreatePanel(this);
+  views::GridLayout* layout = views::GridLayout::CreatePanel(this);
   SetLayoutManager(layout);
 
   const int kSelectorBoxLayoutId = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(kSelectorBoxLayoutId);
-  column_set->AddColumn(
-      GridLayout::FILL, GridLayout::FILL, 1, GridLayout::USE_PREF, 0, 0);
+  column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1,
+                        views::GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, kSelectorBoxLayoutId);
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   // Add SCT selector drop-down list.
   layout->StartRow(0, kSelectorBoxLayoutId);
   sct_list_model_.reset(new SCTListModel(sct_list_));
   sct_selector_box_.reset(new views::Combobox(sct_list_model_.get()));
   sct_selector_box_->set_listener(this);
   sct_selector_box_->set_owned_by_client();
@@ skipping 16 matching lines @@
   sct_info_view_->SetSignedCertificateTimestamp(*(sct_list_[sct_index].sct),
                                                 sct_list_[sct_index].status);
 }
 
 void SignedCertificateTimestampsViews::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   GetWidget()->Close();
 }