Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / views / signed_certificate_timestamps_views.cc

diff --git a/src/chrome/browser/ui/views/signed_certificate_timestamps_views.cc b/src/chrome/browser/ui/views/signed_certificate_timestamps_views.cc
index aa11c29..77264ed 100644 (file)
--- a/src/chrome/browser/ui/views/signed_certificate_timestamps_views.cc
+++ b/src/chrome/browser/ui/views/signed_certificate_timestamps_views.cc
@@ -4,20 +4,16 @@
 
 #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 "chrome/grit/generated_resources.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"
@@ -25,10 +21,6 @@
 #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(
@@ -92,28 +84,19 @@ base::string16 SCTListModel::GetItemAt(int index) {
   std::string status = l10n_util::GetStringUTF8(
       chrome::ct::StatusToResourceID(sct_list_[index].status));
 
-  // TODO(eranm): Internationalization: If the locale is a RTL one,
-  // format the string so that the index is on the right, status
-  // and origin on the left. Specifically: the format part should be a
-  // localized IDS string where the placeholders get rearranged for RTL locales,
-  // GetStringFUTF16 is used to replace the placeholders with these
-  // origin/status strings and the numbered index.
-  return base::UTF8ToUTF16(base::StringPrintf(
-      "%d: %s, %s", index + 1, origin.c_str(), status.c_str()));
+  // This formatting string may be internationalized for RTL, etc.
+  return l10n_util::GetStringFUTF16(IDS_SCT_CHOOSER_FORMAT,
+                                    base::IntToString16(index + 1),
+                                    base::UTF8ToUTF16(origin),
+                                    base::UTF8ToUTF16(status));
 }
 
 SignedCertificateTimestampsViews::SignedCertificateTimestampsViews(
     content::WebContents* web_contents,
     const net::SignedCertificateTimestampAndStatusList& sct_list)
-    : web_contents_(web_contents), 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->ShowDialog(window->GetNativeView());
+    : sct_info_view_(NULL),
+      sct_list_(sct_list) {
+  ShowWebModalDialogViews(this, web_contents);
 }
 
 SignedCertificateTimestampsViews::~SignedCertificateTimestampsViews() {}
@@ -127,11 +110,7 @@ int SignedCertificateTimestampsViews::GetDialogButtons() const {
 }
 
 ui::ModalType SignedCertificateTimestampsViews::GetModalType() const {
-#if defined(USE_ASH)
   return ui::MODAL_TYPE_CHILD;
-#else
-  return views::WidgetDelegate::GetModalType();
-#endif
 }
 
 void SignedCertificateTimestampsViews::OnPerformAction(
@@ -141,12 +120,6 @@ void SignedCertificateTimestampsViews::OnPerformAction(
   ShowSCTInfo(combobox->selected_index());
 }
 
-gfx::Size SignedCertificateTimestampsViews::GetMinimumSize() {
-  // Allow UpdateWebContentsModalDialogPosition to clamp the dialog width.
-  return gfx::Size(View::GetMinimumSize().width() + 300,
-                   View::GetMinimumSize().height());
-}
-
 void SignedCertificateTimestampsViews::ViewHierarchyChanged(
     const ViewHierarchyChangedDetails& details) {
   if (details.is_add && details.child == this)
@@ -154,13 +127,13 @@ void SignedCertificateTimestampsViews::ViewHierarchyChanged(
 }
 
 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);