diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-03 03:05:11 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-03 03:05:11 +0000 |
commit | 4acc19a6f31abef9608546d10f107240603ca57e (patch) | |
tree | 632c914c428e94c05c8b9cb52cb183e62ae13e56 /chrome/common | |
parent | 15936cdb983239ba2347e624af19e7305e416c7b (diff) | |
download | chromium_src-4acc19a6f31abef9608546d10f107240603ca57e.zip chromium_src-4acc19a6f31abef9608546d10f107240603ca57e.tar.gz chromium_src-4acc19a6f31abef9608546d10f107240603ca57e.tar.bz2 |
Move HTML dialogs out of their own tab contents type. Moved functions to new
file html_dialog_ui.*
Move WebContents view creation into the constructor, which makes a bunch of
extra calls to CreateView unnecessary.
Remove unused CallJavascriptFunction() functions in DOMUI.
Review URL: http://codereview.chromium.org/56065
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13065 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r-- | chrome/common/temp_scaffolding_stubs.h | 16 | ||||
-rw-r--r-- | chrome/common/url_constants.cc | 2 | ||||
-rw-r--r-- | chrome/common/url_constants.h | 2 |
3 files changed, 14 insertions, 6 deletions
diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h index 216756f..510e42e 100644 --- a/chrome/common/temp_scaffolding_stubs.h +++ b/chrome/common/temp_scaffolding_stubs.h @@ -24,6 +24,7 @@ #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/cancelable_request.h" +#include "chrome/browser/dom_ui/html_dialog_ui.h" #include "chrome/browser/download/download_shelf.h" #include "chrome/browser/download/save_types.h" #include "chrome/browser/history/download_types.h" @@ -428,7 +429,7 @@ class SelectFileDialog : public base::RefCountedThreadSafe<SelectFileDialog> { void ListenerDestroyed() { NOTIMPLEMENTED(); } void SelectFile(Type, const std::wstring&, const std::wstring&, const std::wstring&, int, const std::wstring&, - gfx::NativeWindow, void*) { NOTIMPLEMENTED(); } + gfx::NativeWindow, void*) { NOTIMPLEMENTED(); } static SelectFileDialog* Create(WebContents*) { NOTIMPLEMENTED(); return new SelectFileDialog; @@ -543,14 +544,17 @@ class ConstrainedWindow { void CloseConstrainedWindow() { NOTIMPLEMENTED(); } }; -class HtmlDialogContentsDelegate { - public: -}; - -class ModalHtmlDialogDelegate : public HtmlDialogContentsDelegate { +class ModalHtmlDialogDelegate : public HtmlDialogUIDelegate { public: ModalHtmlDialogDelegate(const GURL&, int, int, const std::string&, IPC::Message*, WebContents*) { } + + virtual bool IsDialogModal() const { return true; } + virtual std::wstring GetDialogTitle() const { return std::wstring(); } + virtual GURL GetDialogContentURL() const { return GURL(); } + virtual void GetDialogSize(gfx::Size* size) const {} + virtual std::string GetDialogArgs() const { return std::string(); } + virtual void OnDialogClosed(const std::string& json_retval) {} }; class HtmlDialogContents { diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc index 0b1469b..07d5de7 100644 --- a/chrome/common/url_constants.cc +++ b/chrome/common/url_constants.cc @@ -16,6 +16,7 @@ const char kDataScheme[] = "data"; const char kExtensionScheme[] = "chrome-extension"; const char kFileScheme[] = "file"; const char kFtpScheme[] = "ftp"; +const char kGearsScheme[] = "gears"; const char kHttpScheme[] = "http"; const char kHttpsScheme[] = "https"; const char kJavaScriptScheme[] = "javascript"; @@ -45,6 +46,7 @@ const char kChromeUINewTabURL[] = "chrome-ui://newtab"; #endif const char kChromeUIDevToolsHost[] = "devtools"; +const char kChromeUIDialogHost[] = "dialog"; const char kChromeUIDownloadsHost[] = "downloads"; const char kChromeUIExtensionsHost[] = "extensions"; const char kChromeUIFavIconPath[] = "favicon"; diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h index 88faaaf..163d2da 100644 --- a/chrome/common/url_constants.h +++ b/chrome/common/url_constants.h @@ -17,6 +17,7 @@ extern const char kDataScheme[]; extern const char kExtensionScheme[]; extern const char kFileScheme[]; extern const char kFtpScheme[]; +extern const char kGearsScheme[]; extern const char kHttpScheme[]; extern const char kHttpsScheme[]; extern const char kJavaScriptScheme[]; @@ -47,6 +48,7 @@ extern const char kChromeUINewTabURL[]; // chrome-ui components of URLs. Should be kept in sync with the full URLs // above. extern const char kChromeUIDevToolsHost[]; +extern const char kChromeUIDialogHost[]; extern const char kChromeUIDownloadsHost[]; extern const char kChromeUIExtensionsHost[]; extern const char kChromeUIFavIconPath[]; |