| Index: chrome/browser/ui/views/download/download_danger_prompt_views.cc
|
| ===================================================================
|
| --- chrome/browser/ui/views/download/download_danger_prompt_views.cc (revision 249524)
|
| +++ chrome/browser/ui/views/download/download_danger_prompt_views.cc (working copy)
|
| @@ -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"
|
| @@ -58,10 +57,6 @@
|
| 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;
|
| @@ -210,14 +205,6 @@
|
| 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 +286,7 @@
|
| 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(
|
|
|