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

Unified Diff: chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc

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/views/constrained_web_dialog_delegate_views.cc
===================================================================
--- chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc (revision 135175)
+++ chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc (working copy)
@@ -8,8 +8,8 @@
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
#include "chrome/browser/ui/views/constrained_window_views.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/webui/web_dialog_delegate.h"
-#include "chrome/browser/ui/webui/web_dialog_ui.h"
+#include "ui/web_dialogs/web_dialog_delegate.h"
+#include "ui/web_dialogs/web_dialog_ui.h"
#include "content/public/browser/web_contents.h"
#include "ui/gfx/size.h"
#include "ui/views/controls/webview/webview.h"
@@ -25,8 +25,8 @@
public:
ConstrainedWebDialogDelegateViews(
Profile* profile,
- WebDialogDelegate* delegate,
- WebDialogWebContentsDelegate* tab_delegate)
+ web_dialogs::WebDialogDelegate* delegate,
+ ChromeWebDialogWebContentsDelegate* tab_delegate)
: ConstrainedWebDialogDelegateBase(profile, delegate, tab_delegate) {
WebContents* web_contents = tab()->web_contents();
if (tab_delegate) {
@@ -57,8 +57,8 @@
public:
ConstrainedWebDialogDelegateViewViews(
Profile* profile,
- WebDialogDelegate* delegate,
- WebDialogWebContentsDelegate* tab_delegate);
+ web_dialogs::WebDialogDelegate* delegate,
+ ChromeWebDialogWebContentsDelegate* tab_delegate);
virtual ~ConstrainedWebDialogDelegateViewViews();
void set_window(ConstrainedWindow* window) {
@@ -66,11 +66,11 @@
}
// ConstrainedWebDialogDelegate interface
- virtual const WebDialogDelegate*
+ virtual const web_dialogs::WebDialogDelegate*
GetWebDialogDelegate() const OVERRIDE {
return impl_->GetWebDialogDelegate();
}
- virtual WebDialogDelegate* GetWebDialogDelegate() OVERRIDE {
+ virtual web_dialogs::WebDialogDelegate* GetWebDialogDelegate() OVERRIDE {
return impl_->GetWebDialogDelegate();
}
virtual void OnDialogCloseFromWebUI() OVERRIDE {
@@ -123,8 +123,8 @@
ConstrainedWebDialogDelegateViewViews::ConstrainedWebDialogDelegateViewViews(
Profile* profile,
- WebDialogDelegate* delegate,
- WebDialogWebContentsDelegate* tab_delegate)
+ web_dialogs::WebDialogDelegate* delegate,
+ ChromeWebDialogWebContentsDelegate* tab_delegate)
: views::WebView(profile),
impl_(new ConstrainedWebDialogDelegateViews(profile,
delegate,
@@ -139,8 +139,8 @@
ConstrainedWebDialogDelegate*
ConstrainedWebDialogUI::CreateConstrainedWebDialog(
Profile* profile,
- WebDialogDelegate* delegate,
- WebDialogWebContentsDelegate* tab_delegate,
+ web_dialogs::WebDialogDelegate* delegate,
+ ChromeWebDialogWebContentsDelegate* tab_delegate,
TabContentsWrapper* container) {
ConstrainedWebDialogDelegateViewViews* constrained_delegate =
new ConstrainedWebDialogDelegateViewViews(profile, delegate, tab_delegate);

Powered by Google App Engine
This is Rietveld 408576698