Reland: Remove DialogDelegate::OnClosed() which is redundant with

chrome/browser/chromeos/enrollment_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/chromeos/enrollment_dialog_view.h"
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
@@ skipping 35 matching lines @@
 
   static void ShowDialog(gfx::NativeWindow owning_window,
                          const std::string& network_name,
                          Profile* profile,
                          const GURL& target_uri,
                          const base::Closure& connect);
 
   // views::DialogDelegateView overrides
   int GetDialogButtons() const override;
   bool Accept() override;
-  void OnClosed() override;
   base::string16 GetDialogButtonLabel(ui::DialogButton button) const override;
 
   // views::WidgetDelegate overrides
   ui::ModalType GetModalType() const override;
   base::string16 GetWindowTitle() const override;
+  void WindowClosing() override;
 
   // views::View overrides
   gfx::Size GetPreferredSize() const override;
 
  private:
   EnrollmentDialogView(const std::string& network_name,
                        Profile* profile,
                        const GURL& target_uri,
                        const base::Closure& connect);
   void InitDialog();
@@ skipping 41 matching lines @@
 
 int EnrollmentDialogView::GetDialogButtons() const {
   return ui::DIALOG_BUTTON_CANCEL | ui::DIALOG_BUTTON_OK;
 }
 
 bool EnrollmentDialogView::Accept() {
   accepted_ = true;
   return true;
 }
 
-void EnrollmentDialogView::OnClosed() {
-  if (!accepted_)
-    return;
-  chrome::NavigateParams params(profile_,
-                                GURL(target_uri_),
-                                ui::PAGE_TRANSITION_LINK);
-  params.disposition = NEW_FOREGROUND_TAB;
-  params.window_action = chrome::NavigateParams::SHOW_WINDOW;
-  chrome::Navigate(&params);
-}
-
 base::string16 EnrollmentDialogView::GetDialogButtonLabel(
     ui::DialogButton button) const {
   if (button == ui::DIALOG_BUTTON_OK)
     return l10n_util::GetStringUTF16(IDS_NETWORK_ENROLLMENT_HANDLER_BUTTON);
   return views::DialogDelegateView::GetDialogButtonLabel(button);
 }
 
 ui::ModalType EnrollmentDialogView::GetModalType() const {
   return ui::MODAL_TYPE_SYSTEM;
 }
 
 base::string16 EnrollmentDialogView::GetWindowTitle() const {
   return l10n_util::GetStringUTF16(IDS_NETWORK_ENROLLMENT_HANDLER_TITLE);
 }
 
+void EnrollmentDialogView::WindowClosing() {
+  if (!accepted_)
+    return;
+  chrome::NavigateParams params(profile_, GURL(target_uri_),
+                                ui::PAGE_TRANSITION_LINK);
+  params.disposition = NEW_FOREGROUND_TAB;
+  params.window_action = chrome::NavigateParams::SHOW_WINDOW;
+  chrome::Navigate(&params);
+}
+
 gfx::Size EnrollmentDialogView::GetPreferredSize() const {
   return gfx::Size(kDefaultWidth, kDefaultHeight);
 }
 
 void EnrollmentDialogView::InitDialog() {
   added_cert_ = false;
   // Create the views and layout manager and set them up.
   views::Label* label = new views::Label(
       l10n_util::GetStringFUTF16(IDS_NETWORK_ENROLLMENT_HANDLER_INSTRUCTIONS,
                                  base::UTF8ToUTF16(network_name_)));
@@ skipping 142 matching lines @@
 
   DialogEnrollmentDelegate* enrollment =
       new DialogEnrollmentDelegate(owning_window, network->name(), profile);
   return enrollment->Enroll(cert_config.pattern.enrollment_uri_list(),
                             base::Bind(&EnrollmentComplete, service_path));
 }
 
 }  // namespace enrollment
 
 }  // namespace chromeos