views: Make everything in crypto module password dialog private except the ctor.

chrome/browser/ui/views/crypto_module_password_dialog_view.cc

 // Copyright (c) 2012 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/views/crypto_module_password_dialog_view.h"
 
-#include "base/basictypes.h"
-#include "base/bind.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/ui/views/window.h"
-#include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 
 namespace browser {
 
-// CryptoModulePasswordDialogView
 ////////////////////////////////////////////////////////////////////////////////
+// CryptoModulePasswordDialogView, public:
+
 CryptoModulePasswordDialogView::CryptoModulePasswordDialogView(
     const std::string& slot_name,
-    browser::CryptoModulePasswordReason reason,
+    CryptoModulePasswordReason reason,
     const std::string& server,
-    const base::Callback<void(const char*)>& callback)
+    const CryptoModulePasswordCallback& callback)
     : callback_(callback) {
   Init(server, slot_name, reason);
 }
 
 CryptoModulePasswordDialogView::~CryptoModulePasswordDialogView() {
 }
 
-void CryptoModulePasswordDialogView::Init(
-    const std::string& server,
-    const std::string& slot_name,
-    browser::CryptoModulePasswordReason reason) {
+////////////////////////////////////////////////////////////////////////////////
+// CryptoModulePasswordDialogView, private:
+
+views::View* CryptoModulePasswordDialogView::GetInitiallyFocusedView() {
+  return password_entry_;
+}
+
+ui::ModalType CryptoModulePasswordDialogView::GetModalType() const {
+  return ui::MODAL_TYPE_WINDOW;
+}
+
+string16 CryptoModulePasswordDialogView::GetWindowTitle() const {
+  return l10n_util::GetStringUTF16(IDS_CRYPTO_MODULE_AUTH_DIALOG_TITLE);
+}
+
+views::View* CryptoModulePasswordDialogView::GetContentsView() {
+  return this;
+}
+
+string16 CryptoModulePasswordDialogView::GetDialogButtonLabel(
+    ui::DialogButton button) const {
+  return l10n_util::GetStringUTF16(button == ui::DIALOG_BUTTON_OK ?
+      IDS_CRYPTO_MODULE_AUTH_DIALOG_OK_BUTTON_LABEL : IDS_CANCEL);
+}
+
+bool CryptoModulePasswordDialogView::Cancel() {
+  callback_.Run(static_cast<const char*>(NULL));
+  const string16 empty;
+  password_entry_->SetText(empty);
+  return true;
+}
+
+bool CryptoModulePasswordDialogView::Accept() {
+  callback_.Run(UTF16ToUTF8(password_entry_->text()).c_str());
+  const string16 empty;
+  password_entry_->SetText(empty);
+  return true;
+}
+
+
+void CryptoModulePasswordDialogView::ContentsChanged(
+    views::Textfield* sender,
+    const string16& new_contents) {
+}
+
+bool CryptoModulePasswordDialogView::HandleKeyEvent(
+    views::Textfield* sender,
+    const views::KeyEvent& keystroke) {
+  return false;
+}
+
+void CryptoModulePasswordDialogView::Init(const std::string& server,
+                                          const std::string& slot_name,
+                                          CryptoModulePasswordReason reason) {
   // Select an appropriate text for the reason.
   std::string text;
   const string16& server16 = UTF8ToUTF16(server);
   const string16& slot16 = UTF8ToUTF16(slot_name);
   switch (reason) {
     case browser::kCryptoModulePasswordKeygen:
       text = l10n_util::GetStringFUTF8(
           IDS_CRYPTO_MODULE_AUTH_DIALOG_TEXT_KEYGEN, slot16, server16);
       break;
     case browser::kCryptoModulePasswordCertEnrollment:
@@ skipping 47 matching lines @@
 
   layout->StartRow(0, 0);
   layout->AddView(reason_label_);
   layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing);
 
   layout->StartRow(0, 1);
   layout->AddView(password_label_);
   layout->AddView(password_entry_);
 }
 
-views::View* CryptoModulePasswordDialogView::GetInitiallyFocusedView() {
-  return password_entry_;
-}
-
-ui::ModalType CryptoModulePasswordDialogView::GetModalType() const {
-  return ui::MODAL_TYPE_WINDOW;
-}
-
-views::View* CryptoModulePasswordDialogView::GetContentsView() {
-  return this;
-}
-
-string16 CryptoModulePasswordDialogView::GetDialogButtonLabel(
-    ui::DialogButton button) const {
-  return l10n_util::GetStringUTF16(button == ui::DIALOG_BUTTON_OK ?
-      IDS_CRYPTO_MODULE_AUTH_DIALOG_OK_BUTTON_LABEL : IDS_CANCEL);
-}
-
-bool CryptoModulePasswordDialogView::Accept() {
-  callback_.Run(UTF16ToUTF8(password_entry_->text()).c_str());
-  const string16 empty;
-  password_entry_->SetText(empty);
-  return true;
-}
-
-bool CryptoModulePasswordDialogView::Cancel() {
-  callback_.Run(static_cast<const char*>(NULL));
-  const string16 empty;
-  password_entry_->SetText(empty);
-  return true;
-}
-
-bool CryptoModulePasswordDialogView::HandleKeyEvent(
-    views::Textfield* sender,
-    const views::KeyEvent& keystroke) {
-  return false;
-}
-
-void CryptoModulePasswordDialogView::ContentsChanged(
-    views::Textfield* sender,
-    const string16& new_contents) {
-}
-
-string16 CryptoModulePasswordDialogView::GetWindowTitle() const {
-  return l10n_util::GetStringUTF16(IDS_CRYPTO_MODULE_AUTH_DIALOG_TITLE);
-}
-
 void ShowCryptoModulePasswordDialog(
     const std::string& slot_name,
     bool retry,
     CryptoModulePasswordReason reason,
     const std::string& server,
     const CryptoModulePasswordCallback& callback) {
   CryptoModulePasswordDialogView* dialog =
       new CryptoModulePasswordDialogView(slot_name, reason, server, callback);
   views::Widget::CreateWindow(dialog)->Show();
 }
 
 }  // namespace browser