diff options
| author | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-31 08:43:14 +0000 |
|---|---|---|
| committer | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-31 08:43:14 +0000 |
| commit | 20c07f8e4ae645987e368559f8f702c505d77bcd (patch) | |
| tree | 5d5b259a0f6f92ebd2a961ced8688cc759660259 /chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h | |
| parent | af1430a0e006d20858b2f00859b186ab36f94128 (diff) | |
| download | chromium_src-20c07f8e4ae645987e368559f8f702c505d77bcd.zip chromium_src-20c07f8e4ae645987e368559f8f702c505d77bcd.tar.gz chromium_src-20c07f8e4ae645987e368559f8f702c505d77bcd.tar.bz2 | |
Move the web dialogs code to src/ui/web_dialogs from src/chrome
Also moved the web dialogs classes into ui namespace.
The original patch was sent by Jake Helfert <jake@helfert.us>.
This patch was created based on Jake's patch.
BUG=125841
TEST=try
Review URL: https://chromiumcodereview.appspot.com/10448066
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139757 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h')
| -rw-r--r-- | chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h b/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h index 254579f..a06464f 100644 --- a/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h +++ b/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h @@ -8,28 +8,32 @@ #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" -#include "chrome/browser/ui/webui/constrained_web_dialog_ui.h" #include "chrome/browser/ui/webui/web_dialog_web_contents_delegate.h" -#include "chrome/browser/ui/webui/web_dialog_ui.h" +#include "ui/web_dialogs/constrained_web_dialog_ui.h" +#include "ui/web_dialogs/web_dialog_ui.h" + +namespace ui { +class WebDialogDelegate; +} // Platform-agnostic base implementation of ConstrainedWebDialogDelegate. class ConstrainedWebDialogDelegateBase - : public ConstrainedWebDialogDelegate, + : public ui::ConstrainedWebDialogDelegate, public WebDialogWebContentsDelegate { public: ConstrainedWebDialogDelegateBase( Profile* profile, - WebDialogDelegate* delegate, + ui::WebDialogDelegate* delegate, WebDialogWebContentsDelegate* tab_delegate); virtual ~ConstrainedWebDialogDelegateBase(); void set_window(ConstrainedWindow* window); bool closed_via_webui() const; - // ConstrainedWebDialogDelegate interface. - virtual const WebDialogDelegate* + // ui::ConstrainedWebDialogDelegate interface. + virtual const ui::WebDialogDelegate* GetWebDialogDelegate() const OVERRIDE; - virtual WebDialogDelegate* GetWebDialogDelegate() OVERRIDE; + virtual ui::WebDialogDelegate* GetWebDialogDelegate() OVERRIDE; virtual void OnDialogCloseFromWebUI() OVERRIDE; virtual void ReleaseTabContentsOnDialogClose() OVERRIDE; virtual ConstrainedWindow* window() OVERRIDE; @@ -44,7 +48,7 @@ class ConstrainedWebDialogDelegateBase WebDialogWebContentsDelegate* override_tab_delegate); private: - WebDialogDelegate* web_dialog_delegate_; + ui::WebDialogDelegate* web_dialog_delegate_; // The constrained window that owns |this|. Saved so we can close it later. ConstrainedWindow* window_; |