diff options
Diffstat (limited to 'chrome/browser/views')
-rw-r--r-- | chrome/browser/views/html_dialog_view.cc | 8 | ||||
-rw-r--r-- | chrome/browser/views/html_dialog_view.h | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/views/html_dialog_view.cc b/chrome/browser/views/html_dialog_view.cc index 0ef3b9e..76281f3 100644 --- a/chrome/browser/views/html_dialog_view.cc +++ b/chrome/browser/views/html_dialog_view.cc @@ -29,9 +29,9 @@ HtmlDialogView::~HtmlDialogView() { // HtmlDialogView, views::View implementation: gfx::Size HtmlDialogView::GetPreferredSize() { - CSize out; + gfx::Size out; delegate_->GetDialogSize(&out); - return gfx::Size(out.cx, out.cy); + return out; } //////////////////////////////////////////////////////////////////////////////// @@ -80,8 +80,8 @@ GURL HtmlDialogView::GetDialogContentURL() const { return delegate_->GetDialogContentURL(); } -void HtmlDialogView::GetDialogSize(CSize* size) const { - return delegate_->GetDialogSize(size); +void HtmlDialogView::GetDialogSize(gfx::Size* size) const { + delegate_->GetDialogSize(size); } std::string HtmlDialogView::GetDialogArgs() const { diff --git a/chrome/browser/views/html_dialog_view.h b/chrome/browser/views/html_dialog_view.h index 6a4e144..e03997f 100644 --- a/chrome/browser/views/html_dialog_view.h +++ b/chrome/browser/views/html_dialog_view.h @@ -7,6 +7,7 @@ #include <string> +#include "base/gfx/size.h" #include "chrome/browser/dom_ui/html_dialog_contents.h" #include "chrome/browser/tab_contents/tab_contents_delegate.h" #include "chrome/browser/views/dom_view.h" @@ -55,7 +56,7 @@ class HtmlDialogView virtual bool IsDialogModal() const; virtual std::wstring GetDialogTitle() const; virtual GURL GetDialogContentURL() const; - virtual void GetDialogSize(CSize* size) const; + virtual void GetDialogSize(gfx::Size* size) const; virtual std::string GetDialogArgs() const; virtual void OnDialogClosed(const std::string& json_retval); |