Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(644)

Unified Diff: chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h

Issue 10448066: Move the web dialogs code to src/ui/web_dialogs from src/chrome (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h
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 254579fa8d24325deb97e70ebf1a32ca032dd11f..a06464f9264e40641faa7b76b78e74f5a910d6ae 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_;

Powered by Google App Engine
This is Rietveld 408576698