| Index: chrome/browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm
|
| ===================================================================
|
| --- chrome/browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm (revision 135175)
|
| +++ chrome/browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm (working copy)
|
| @@ -9,11 +9,11 @@
|
| #include "base/memory/scoped_nsobject.h"
|
| #include "chrome/browser/ui/cocoa/constrained_window_mac.h"
|
| #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
|
| -#include "chrome/browser/ui/webui/web_dialog_delegate.h"
|
| -#include "chrome/browser/ui/webui/web_dialog_ui.h"
|
| -#include "chrome/browser/ui/webui/web_dialog_web_contents_delegate.h"
|
| #include "content/public/browser/web_contents.h"
|
| #include "ui/gfx/size.h"
|
| +#include "ui/web_dialogs/web_dialog_delegate.h"
|
| +#include "ui/web_dialogs/web_dialog_ui.h"
|
| +#include "ui/web_dialogs/web_dialog_web_contents_delegate.h"
|
|
|
| using content::WebContents;
|
|
|
| @@ -24,8 +24,8 @@
|
| public:
|
| ConstrainedWebDialogDelegateMac(
|
| Profile* profile,
|
| - WebDialogDelegate* delegate,
|
| - WebDialogWebContentsDelegate* tab_delegate);
|
| + web_dialogs::WebDialogDelegate* delegate,
|
| + web_dialogs::WebDialogWebContentsDelegate* tab_delegate);
|
| virtual ~ConstrainedWebDialogDelegateMac() {}
|
|
|
| void set_window(ConstrainedWindow* window) {
|
| @@ -33,11 +33,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 {
|
| @@ -85,8 +85,8 @@
|
|
|
| ConstrainedWebDialogDelegateMac::ConstrainedWebDialogDelegateMac(
|
| Profile* profile,
|
| - WebDialogDelegate* delegate,
|
| - WebDialogWebContentsDelegate* tab_delegate)
|
| + web_dialogs::WebDialogDelegate* delegate,
|
| + web_dialogs::WebDialogWebContentsDelegate* tab_delegate)
|
| : impl_(new ConstrainedWebDialogDelegateBase(profile,
|
| delegate,
|
| tab_delegate)) {
|
| @@ -118,8 +118,8 @@
|
| ConstrainedWebDialogDelegate*
|
| ConstrainedWebDialogUI::CreateConstrainedWebDialog(
|
| Profile* profile,
|
| - WebDialogDelegate* delegate,
|
| - WebDialogWebContentsDelegate* tab_delegate,
|
| + web_dialogs::WebDialogDelegate* delegate,
|
| + web_dialogs::WebDialogWebContentsDelegate* tab_delegate,
|
| TabContentsWrapper* wrapper) {
|
| // Deleted when ConstrainedWebDialogDelegateMac::DeleteDelegate() runs.
|
| ConstrainedWebDialogDelegateMac* constrained_delegate =
|
|
|