Merging revision 68447

chrome/browser/js_modal_dialog.h

 // Copyright (c) 2010 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.
 
 #ifndef CHROME_BROWSER_JS_MODAL_DIALOG_H_
 #define CHROME_BROWSER_JS_MODAL_DIALOG_H_
 #pragma once
 
 #include <string>
 
@@ skipping 60 matching lines @@
   void OnAccept(const std::wstring& prompt_text, bool suppress_js_messages);
   void OnClose();
 
   // Accessors
   int dialog_flags() const { return dialog_flags_; }
   std::wstring message_text() const { return message_text_; }
   std::wstring default_prompt_text() const { return default_prompt_text_; }
   bool display_suppress_checkbox() const { return display_suppress_checkbox_; }
   bool is_before_unload_dialog() const { return is_before_unload_dialog_; }
 
- protected:
-  // Overridden from AppModalDialog:
-  virtual void Cleanup();
-
  private:
   // Overridden from NotificationObserver:
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
   // Initializes for notifications to listen.
   void InitNotifications();
+  // Updates the delegate with the result of the dialog.
+  void UpdateDelegate(bool success, const std::wstring& prompt_text,
+                      bool suppress_js_messages);
 
   NotificationRegistrar registrar_;
 
   // An implementation of the client interface to provide supporting methods
   // and receive results.
   JavaScriptAppModalDialogDelegate* delegate_;
 
   // The client_ as an ExtensionHost, cached for use during notifications that
   // may arrive after the client has entered its destructor (and is thus
   // treated as a base Delegate). This will be NULL if the |delegate_| is not an
   // ExtensionHost.
   ExtensionHost* extension_host_;
 
   // Information about the message box is held in the following variables.
   int dialog_flags_;
   std::wstring message_text_;
   std::wstring default_prompt_text_;
   bool display_suppress_checkbox_;
   bool is_before_unload_dialog_;
   IPC::Message* reply_msg_;
 
   DISALLOW_COPY_AND_ASSIGN(JavaScriptAppModalDialog);
 };
 
 #endif  // CHROME_BROWSER_JS_MODAL_DIALOG_H_