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

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

Issue 10353007: Extract a minimal subset of WebDialogUI/WebDialogDelegate from src/chrome -> src/ui/web_dialogs Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 8 years, 8 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
===================================================================
--- chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h (revision 135175)
+++ chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h (working copy)
@@ -9,17 +9,21 @@
#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 "chrome/browser/ui/webui/chrome_web_dialog_web_contents_delegate.h"
+#include "ui/web_dialogs/web_dialog_ui.h"
+namespace web_dialogs {
+ class WebDialogDelegate;
+}
+
// Platform-agnostic base implementation of ConstrainedWebDialogDelegate.
class ConstrainedWebDialogDelegateBase
: public ConstrainedWebDialogDelegate,
- public WebDialogWebContentsDelegate {
+ public ChromeWebDialogWebContentsDelegate {
public:
ConstrainedWebDialogDelegateBase(
Profile* profile,
- WebDialogDelegate* delegate,
+ web_dialogs::WebDialogDelegate* delegate,
WebDialogWebContentsDelegate* tab_delegate);
virtual ~ConstrainedWebDialogDelegateBase();
@@ -27,9 +31,9 @@
bool closed_via_webui() const;
// ConstrainedWebDialogDelegate interface.
- virtual const WebDialogDelegate*
+ virtual const web_dialogs::WebDialogDelegate*
GetWebDialogDelegate() const OVERRIDE;
- virtual WebDialogDelegate* GetWebDialogDelegate() OVERRIDE;
+ virtual web_dialogs::WebDialogDelegate* GetWebDialogDelegate() OVERRIDE;
virtual void OnDialogCloseFromWebUI() OVERRIDE;
virtual void ReleaseTabContentsOnDialogClose() OVERRIDE;
virtual ConstrainedWindow* window() OVERRIDE;
@@ -41,10 +45,10 @@
protected:
void set_override_tab_delegate(
- WebDialogWebContentsDelegate* override_tab_delegate);
+ web_dialogs::WebDialogWebContentsDelegate* override_tab_delegate);
private:
- WebDialogDelegate* web_dialog_delegate_;
+ web_dialogs::WebDialogDelegate* web_dialog_delegate_;
// The constrained window that owns |this|. Saved so we can close it later.
ConstrainedWindow* window_;
@@ -59,7 +63,7 @@
// If true, release |tab_| on close instead of destroying it.
bool release_tab_on_close_;
- scoped_ptr<WebDialogWebContentsDelegate> override_tab_delegate_;
+ scoped_ptr<web_dialogs::WebDialogWebContentsDelegate> override_tab_delegate_;
DISALLOW_COPY_AND_ASSIGN(ConstrainedWebDialogDelegateBase);
};

Powered by Google App Engine
This is Rietveld 408576698