Cleanup: Remove deprecated version of views::CreateDialogFrameView().

chrome/browser/ui/views/pdf_password_dialog.cc

 // Copyright 2013 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/pdf/pdf_tab_helper.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 "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/controls/message_box_view.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
@@ skipping 13 matching lines @@
   // views::DialogDelegate:
   virtual base::string16 GetWindowTitle() const OVERRIDE;
   virtual base::string16 GetDialogButtonLabel(
       ui::DialogButton button) const OVERRIDE;
   virtual bool Cancel() OVERRIDE;
   virtual bool Accept() OVERRIDE;
 
   // views::WidgetDelegate:
   virtual views::View* GetInitiallyFocusedView() OVERRIDE;
   virtual views::View* GetContentsView() OVERRIDE;
-  virtual views::NonClientFrameView* CreateNonClientFrameView(
-      views::Widget* widget) OVERRIDE;
   virtual views::Widget* GetWidget() OVERRIDE;
   virtual const views::Widget* GetWidget() const OVERRIDE;
   virtual void DeleteDelegate() OVERRIDE;
   virtual ui::ModalType GetModalType() const OVERRIDE;
 
  private:
   // The message box view whose commands we handle.
   views::MessageBoxView* message_box_view_;
 
   views::Widget* dialog_;
   content::BrowserContext* browser_context_;

[msw, 2014/02/10 19:21:15]

nit: this member can also be removed.

[Lei Zhang, 2014/02/10 23:21:42]

Done.

 
   PasswordDialogClosedCallback callback_;
 
   DISALLOW_COPY_AND_ASSIGN(PDFPasswordDialogViews);
 };
 
 PDFPasswordDialogViews::PDFPasswordDialogViews(
     content::WebContents* web_contents,
     const base::string16& prompt,
     const PasswordDialogClosedCallback& callback)
@@ skipping 58 matching lines @@
 // PDFPasswordDialogViews, views::WidgetDelegate implementation:
 
 views::View* PDFPasswordDialogViews::GetInitiallyFocusedView() {
   return message_box_view_->text_box();
 }
 
 views::View* PDFPasswordDialogViews::GetContentsView() {
   return message_box_view_;
 }
 
-// TODO(wittman): Remove this override once we move to the new style frame view
-// on all dialogs.
-views::NonClientFrameView* PDFPasswordDialogViews::CreateNonClientFrameView(
-    views::Widget* widget) {
-  return CreateConstrainedStyleNonClientFrameView(widget, browser_context_);
-}
-
 views::Widget* PDFPasswordDialogViews::GetWidget() {
   return message_box_view_->GetWidget();
 }
 
 const views::Widget* PDFPasswordDialogViews::GetWidget() const {
   return message_box_view_->GetWidget();
 }
 
 void PDFPasswordDialogViews::DeleteDelegate() {
   delete this;
 }
 
 ui::ModalType PDFPasswordDialogViews::GetModalType() const {
 #if defined(USE_ASH)
   return ui::MODAL_TYPE_CHILD;
 #else
   return views::WidgetDelegate::GetModalType();
 #endif
 }
 
 }  // namespace
 
 void ShowPDFPasswordDialog(content::WebContents* web_contents,
                            const base::string16& prompt,
                            const PasswordDialogClosedCallback& callback) {
   new PDFPasswordDialogViews(web_contents, prompt, callback);
 }