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

Unified Diff: chrome/browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm

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
« no previous file with comments | « chrome/browser/ui/browser_dialogs.h ('k') | chrome/browser/ui/cocoa/web_dialog_window_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm
diff --git a/chrome/browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm b/chrome/browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm
index 35bc12df2677e6d4bdf50b649a2164776f6b514a..c50db2fa569829a552d6dd8ec0b51dbe69c737a3 100644
--- a/chrome/browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm
+++ b/chrome/browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm
@@ -9,13 +9,15 @@
#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"
using content::WebContents;
+using ui::WebDialogDelegate;
+using ui::ConstrainedWebDialogDelegate;
class ConstrainedWebDialogDelegateMac :
public ConstrainedWindowMacDelegateCustomSheet,
@@ -114,9 +116,7 @@ ConstrainedWebDialogDelegateMac::ConstrainedWebDialogDelegateMac(
@selector(sheetDidEnd:returnCode:contextInfo:));
}
-// static
-ConstrainedWebDialogDelegate*
- ConstrainedWebDialogUI::CreateConstrainedWebDialog(
+ConstrainedWebDialogDelegate* ui::CreateConstrainedWebDialog(
Profile* profile,
WebDialogDelegate* delegate,
WebDialogWebContentsDelegate* tab_delegate,
« no previous file with comments | « chrome/browser/ui/browser_dialogs.h ('k') | chrome/browser/ui/cocoa/web_dialog_window_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698