diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-24 01:18:57 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-24 01:18:57 +0000 |
| commit | b0c6e5d820fb2da79f9f36e449f66caec1389bfd (patch) | |
| tree | a4fd0622c4a0b58f01fd88811bca411f4c048137 /chrome/browser/dom_ui | |
| parent | 991fee4eda6561e606f780030af1bfbaba732a10 (diff) | |
| download | chromium_src-b0c6e5d820fb2da79f9f36e449f66caec1389bfd.zip chromium_src-b0c6e5d820fb2da79f9f36e449f66caec1389bfd.tar.gz chromium_src-b0c6e5d820fb2da79f9f36e449f66caec1389bfd.tar.bz2 | |
HtmlDialogContentsDelegate should not subclass views::WindowDelegate, for portability reasons (views isn't used on Mac or Linux).
Instead, add modal/title getting methods to HtmlDialogContentsDelegate directly, and have the UI (HtmlDialogView) call to these in the Modal/ModelessHtmlDialogDelegate in its implementation of views::WindowDelegate instead.
TEST=open any page and test that Page->Create application shortcuts still works. visit any site that uses Gears and make sure the Gears Allow/Deny dialog still comes up.
Review URL: http://codereview.chromium.org/27074
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10236 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/dom_ui')
| -rw-r--r-- | chrome/browser/dom_ui/html_dialog_contents.h | 7 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/new_tab_ui.cc | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/dom_ui/html_dialog_contents.h b/chrome/browser/dom_ui/html_dialog_contents.h index 1a4c3a1..ff31002 100644 --- a/chrome/browser/dom_ui/html_dialog_contents.h +++ b/chrome/browser/dom_ui/html_dialog_contents.h @@ -6,11 +6,14 @@ #define CHROME_BROWSER_DOM_UI_HTML_DIALOG_CONTENTS_H__ #include "chrome/browser/dom_ui/dom_ui_host.h" -#include "chrome/views/window_delegate.h" // Implement this class to receive notifications. -class HtmlDialogContentsDelegate : public views::WindowDelegate { +class HtmlDialogContentsDelegate { public: + // Returns true if the contents needs to be run in a modal dialog. + virtual bool IsDialogModal() const = 0; + // Returns the title of the dialog. + virtual std::wstring GetDialogTitle() const = 0; // Get the HTML file path for the content to load in the dialog. virtual GURL GetDialogContentURL() const = 0; // Get the size of the dialog. diff --git a/chrome/browser/dom_ui/new_tab_ui.cc b/chrome/browser/dom_ui/new_tab_ui.cc index 4a77e3a..506d525 100644 --- a/chrome/browser/dom_ui/new_tab_ui.cc +++ b/chrome/browser/dom_ui/new_tab_ui.cc @@ -19,7 +19,6 @@ #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/user_data_manager.h" -#include "chrome/browser/views/keyword_editor_view.h" #include "chrome/common/jstemplate_builder.h" #include "chrome/common/l10n_util.h" #include "chrome/common/notification_service.h" |