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/browser/chrome_plugin_host.cc | |
| 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/browser/chrome_plugin_host.cc')
| -rw-r--r-- | chrome/browser/chrome_plugin_host.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/chrome_plugin_host.cc b/chrome/browser/chrome_plugin_host.cc index 62b9411..373bee1 100644 --- a/chrome/browser/chrome_plugin_host.cc +++ b/chrome/browser/chrome_plugin_host.cc @@ -19,6 +19,7 @@ #include "chrome/browser/browser_list.h" #include "chrome/browser/chrome_plugin_browsing_context.h" #include "chrome/browser/chrome_thread.h" +#include "chrome/browser/dom_ui/html_dialog_ui.h" #include "chrome/browser/gears_integration.h" #include "chrome/browser/plugin_process_host.h" #include "chrome/browser/plugin_service.h" @@ -43,7 +44,7 @@ // TODO(port): Port these files. #if defined(OS_WIN) -#include "chrome/browser/dom_ui/html_dialog_contents.h" +#include "chrome/browser/dom_ui/html_dialog_ui.h" #else #include "chrome/common/temp_scaffolding_stubs.h" #endif @@ -282,7 +283,7 @@ PluginCommandHandler* PluginCommandHandler::instance_ = NULL; // This class acts as a helper to display the HTML dialog. It is created // on demand on the plugin thread, and proxies calls to and from the UI thread // to display the UI. -class ModelessHtmlDialogDelegate : public HtmlDialogContentsDelegate { +class ModelessHtmlDialogDelegate : public HtmlDialogUIDelegate { public: ModelessHtmlDialogDelegate(const GURL& url, int width, int height, @@ -311,7 +312,7 @@ class ModelessHtmlDialogDelegate : public HtmlDialogContentsDelegate { // The following public methods are called from the UI thread. - // HtmlDialogContentsDelegate implementation: + // HtmlDialogUIDelegate implementation: virtual bool IsDialogModal() const { return false; } virtual std::wstring GetDialogTitle() const { return L"Google Gears"; } virtual GURL GetDialogContentURL() const { return params_.url; } @@ -344,7 +345,7 @@ class ModelessHtmlDialogDelegate : public HtmlDialogContentsDelegate { } // The parameters needed to display a modal HTML dialog. - HtmlDialogContents::HtmlDialogParams params_; + HtmlDialogUI::HtmlDialogParams params_; // Message loops for sending messages between UI and IO threads. MessageLoop* main_message_loop_; |