WebDialogs

chrome/browser/ui/webui/constrained_web_dialog_ui.h

Index: chrome/browser/ui/webui/constrained_web_dialog_ui.h
===================================================================
--- chrome/browser/ui/webui/constrained_web_dialog_ui.h	(revision 133680)
+++ chrome/browser/ui/webui/constrained_web_dialog_ui.h	(working copy)
@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_WEBUI_CONSTRAINED_HTML_UI_H_
-#define CHROME_BROWSER_UI_WEBUI_CONSTRAINED_HTML_UI_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_CONSTRAINED_WEB_DIALOG_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_CONSTRAINED_WEB_DIALOG_UI_H_
 #pragma once
 
 #include "base/compiler_specific.h"
 #include "content/public/browser/web_ui_controller.h"
 
 class ConstrainedWindow;
-class HtmlDialogTabContentsDelegate;
-class HtmlDialogUIDelegate;
 class Profile;
 class TabContentsWrapper;
+class WebDialogDelegate;
+class WebDialogWebContentsDelegate;
 
 namespace base {
 template<class T> class PropertyAccessor;
@@ -23,10 +23,10 @@
 class RenderViewHost;
 }
 
-class ConstrainedHtmlUIDelegate {
+class ConstrainedWebDialogDelegate {
  public:
-  virtual const HtmlDialogUIDelegate* GetHtmlDialogUIDelegate() const = 0;
-  virtual HtmlDialogUIDelegate* GetHtmlDialogUIDelegate() = 0;
+  virtual const WebDialogDelegate* GetWebDialogDelegate() const = 0;
+  virtual WebDialogDelegate* GetWebDialogDelegate() = 0;
 
   // Called when the dialog is being closed in response to a "DialogClose"
   // message from WebUI.
@@ -44,57 +44,57 @@
   virtual TabContentsWrapper* tab() = 0;
 
  protected:
-  virtual ~ConstrainedHtmlUIDelegate() {}
+  virtual ~ConstrainedWebDialogDelegate() {}
 };
 
-// ConstrainedHtmlUI is a facility to show HTML WebUI content
+// ConstrainedWebDialogUI is a facility to show HTML WebUI content
 // in a tab-modal constrained dialog.  It is implemented as an adapter
-// between an HtmlDialogUI object and a ConstrainedWindow object.
+// between an WebDialogUI object and a ConstrainedWindow object.
 //
 // Since ConstrainedWindow requires platform-specific delegate
 // implementations, this class is just a factory stub.
 // TODO(thestig) Refactor the platform-independent code out of the
 // platform-specific implementations.
-class ConstrainedHtmlUI : public content::WebUIController {
+class ConstrainedWebDialogUI : public content::WebUIController {
  public:
-  explicit ConstrainedHtmlUI(content::WebUI* web_ui);
-  virtual ~ConstrainedHtmlUI();
+  explicit ConstrainedWebDialogUI(content::WebUI* web_ui);
+  virtual ~ConstrainedWebDialogUI();
 
   // WebUIController implementation:
   virtual void RenderViewCreated(
       content::RenderViewHost* render_view_host) OVERRIDE;
 
   // Create a constrained HTML dialog. The actual object that gets created
-  // is a ConstrainedHtmlUIDelegate, which later triggers construction of a
-  // ConstrainedHtmlUI object.
+  // is a ConstrainedWebDialogDelegate, which later triggers construction of a
+  // ConstrainedWebDialogUI object.
   // |profile| is used to construct the constrained HTML dialog's WebContents.
   // |delegate| controls the behavior of the dialog.
   // |tab_delegate| is optional, pass one in to use a custom
-  //                HtmlDialogTabContentsDelegate with the dialog, or NULL to
+  //                WebDialogWebContentsDelegate with the dialog, or NULL to
   //                use the default one. The dialog takes ownership of
   //                |tab_delegate|.
   // |overshadowed| is the tab being overshadowed by the dialog.
-  static ConstrainedHtmlUIDelegate* CreateConstrainedHtmlDialog(
+  static ConstrainedWebDialogDelegate* CreateConstrainedWebDialog(
       Profile* profile,
-      HtmlDialogUIDelegate* delegate,
-      HtmlDialogTabContentsDelegate* tab_delegate,
+      WebDialogDelegate* delegate,
+      WebDialogWebContentsDelegate* tab_delegate,
       TabContentsWrapper* overshadowed);
 
   // Returns a property accessor that can be used to set the
-  // ConstrainedHtmlUIDelegate property on a WebContents.
-  static base::PropertyAccessor<ConstrainedHtmlUIDelegate*>&
+  // ConstrainedWebDialogDelegate property on a WebContents.
+  static base::PropertyAccessor<ConstrainedWebDialogDelegate*>&
       GetPropertyAccessor();
 
  protected:
-  // Returns the WebContents' PropertyBag's ConstrainedHtmlUIDelegate.
+  // Returns the WebContents' PropertyBag's ConstrainedWebDialogDelegate.
   // Returns NULL if that property is not set.
-  ConstrainedHtmlUIDelegate* GetConstrainedDelegate();
+  ConstrainedWebDialogDelegate* GetConstrainedDelegate();
 
  private:
   // JS Message Handler
   void OnDialogCloseMessage(const base::ListValue* args);
 
-  DISALLOW_COPY_AND_ASSIGN(ConstrainedHtmlUI);
+  DISALLOW_COPY_AND_ASSIGN(ConstrainedWebDialogUI);
 };
 
-#endif  // CHROME_BROWSER_UI_WEBUI_CONSTRAINED_HTML_UI_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_CONSTRAINED_WEB_DIALOG_UI_H_