Upstream version 5.34.104.0

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

diff --git a/src/chrome/browser/ui/views/download/download_danger_prompt_views.cc b/src/chrome/browser/ui/views/download/download_danger_prompt_views.cc
index 8f01728..233503f 100644 (file)
--- a/src/chrome/browser/ui/views/download/download_danger_prompt_views.cc
+++ b/src/chrome/browser/ui/views/download/download_danger_prompt_views.cc
@@ -5,7 +5,6 @@
 #include "base/compiler_specific.h"
 #include "chrome/browser/download/download_danger_prompt.h"
 #include "chrome/browser/download/download_stats.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"
@@ -16,6 +15,7 @@
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/grid_layout.h"
@@ -57,10 +57,6 @@ class DownloadDangerPromptViews : public DownloadDangerPrompt,
   virtual bool Cancel() OVERRIDE;
   virtual bool Accept() OVERRIDE;
   virtual bool Close() OVERRIDE;
-  // TODO(wittman): Remove this override once we move to the new style frame
-  // view on all dialogs.
-  virtual views::NonClientFrameView* CreateNonClientFrameView(
-      views::Widget* widget) OVERRIDE;
   virtual views::View* GetInitiallyFocusedView() OVERRIDE;
   virtual views::View* GetContentsView() OVERRIDE;
   virtual views::Widget* GetWidget() OVERRIDE;
@@ -78,7 +74,6 @@ class DownloadDangerPromptViews : public DownloadDangerPrompt,
   void RunDone(Action action);
 
   content::DownloadItem* download_;
-  content::WebContents* web_contents_;
   bool show_context_;
   OnDone done_;
 
@@ -91,7 +86,6 @@ DownloadDangerPromptViews::DownloadDangerPromptViews(
     bool show_context,
     const OnDone& done)
     : download_(item),
-      web_contents_(web_contents),
       show_context_(show_context),
       done_(done),
       contents_view_(NULL) {
@@ -110,14 +104,13 @@ DownloadDangerPromptViews::DownloadDangerPromptViews(
   const base::string16 message_lead = GetMessageLead();
 
   if (!message_lead.empty()) {
-    views::Label* message_lead_label = new views::Label(message_lead);
+    ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
+    views::Label* message_lead_label = new views::Label(
+        message_lead, rb->GetFontList(ui::ResourceBundle::BoldFont));
     message_lead_label->SetMultiLine(true);
     message_lead_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     message_lead_label->SetAllowCharacterBreak(true);
 
-    gfx::FontList font_list(gfx::Font().DeriveFont(0, gfx::Font::BOLD));
-    message_lead_label->SetFontList(font_list);
-
     layout->StartRow(0, 0);
     layout->AddView(message_lead_label);
 
@@ -210,14 +203,6 @@ bool DownloadDangerPromptViews::Close() {
   return true;
 }
 
-// TODO(wittman): Remove this override once we move to the new style frame
-// view on all dialogs.
-views::NonClientFrameView* DownloadDangerPromptViews::CreateNonClientFrameView(
-    views::Widget* widget) {
-  return CreateConstrainedStyleNonClientFrameView(
-      widget, web_contents_->GetBrowserContext());
-}
-
 views::View* DownloadDangerPromptViews::GetInitiallyFocusedView() {
   return GetDialogClientView()->cancel_button();
 }
@@ -299,7 +284,7 @@ base::string16 DownloadDangerPromptViews::GetMessageBody() const {
             IDS_PROMPT_DANGEROUS_DOWNLOAD,
             download_->GetFileNameToReportUser().LossyDisplayName());
       }
-      case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_URL: // Fall through
+      case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_URL:  // Fall through
       case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_CONTENT:
       case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_HOST: {
         return l10n_util::GetStringFUTF16(