Upstream version 10.39.225.0

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

diff --git a/src/chrome/browser/ui/views/pdf_password_dialog.cc b/src/chrome/browser/ui/views/pdf_password_dialog.cc
index cffd1c9..f444fab 100644 (file)
--- a/src/chrome/browser/ui/views/pdf_password_dialog.cc
+++ b/src/chrome/browser/ui/views/pdf_password_dialog.cc
@@ -2,11 +2,10 @@
 // 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 "chrome/grit/generated_resources.h"
+#include "components/pdf/browser/pdf_web_contents_helper_client.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"
@@ -21,7 +20,7 @@ class PDFPasswordDialogViews : public views::DialogDelegate {
  public:
   PDFPasswordDialogViews(content::WebContents* web_contents,
                          const base::string16& prompt,
-                         const PasswordDialogClosedCallback& callback);
+                         const pdf::PasswordDialogClosedCallback& callback);
   virtual ~PDFPasswordDialogViews();
 
   // views::DialogDelegate:
@@ -43,7 +42,7 @@ class PDFPasswordDialogViews : public views::DialogDelegate {
   // The message box view whose commands we handle.
   views::MessageBoxView* message_box_view_;
 
-  PasswordDialogClosedCallback callback_;
+  pdf::PasswordDialogClosedCallback callback_;
 
   DISALLOW_COPY_AND_ASSIGN(PDFPasswordDialogViews);
 };
@@ -51,9 +50,8 @@ class PDFPasswordDialogViews : public views::DialogDelegate {
 PDFPasswordDialogViews::PDFPasswordDialogViews(
     content::WebContents* web_contents,
     const base::string16& prompt,
-    const PasswordDialogClosedCallback& callback)
-    : message_box_view_(NULL),
-      callback_(callback) {
+    const pdf::PasswordDialogClosedCallback& callback)
+    : message_box_view_(NULL), callback_(callback) {
   views::MessageBoxView::InitParams init_params(prompt);
   init_params.options = views::MessageBoxView::HAS_PROMPT_FIELD;
   init_params.inter_row_vertical_spacing =
@@ -130,6 +128,6 @@ ui::ModalType PDFPasswordDialogViews::GetModalType() const {
 
 void ShowPDFPasswordDialog(content::WebContents* web_contents,
                            const base::string16& prompt,
-                           const PasswordDialogClosedCallback& callback) {
+                           const pdf::PasswordDialogClosedCallback& callback) {
   new PDFPasswordDialogViews(web_contents, prompt, callback);
 }