Index: chrome/browser/ui/views/constrained_html_delegate_win.cc |
=================================================================== |
--- chrome/browser/ui/views/constrained_html_delegate_win.cc (revision 89357) |
+++ chrome/browser/ui/views/constrained_html_delegate_win.cc (working copy) |
@@ -23,25 +23,31 @@ |
~ConstrainedHtmlDelegateWin(); |
// ConstrainedHtmlUIDelegate interface. |
- virtual HtmlDialogUIDelegate* GetHtmlDialogUIDelegate(); |
- virtual void OnDialogClose(); |
+ virtual HtmlDialogUIDelegate* GetHtmlDialogUIDelegate() OVERRIDE; |
+ virtual void OnDialogClose() OVERRIDE; |
// ConstrainedWindowDelegate (aka views::WidgetDelegate) interface. |
- virtual bool CanResize() const { return true; } |
+ virtual bool CanResize() const OVERRIDE { return true; } |
virtual views::View* GetContentsView() { |
return this; |
} |
- virtual void WindowClosing() { |
+ virtual void WindowClosing() OVERRIDE { |
html_delegate_->OnWindowClosed(); |
html_delegate_->OnDialogClosed(""); |
} |
+ virtual views::Widget* GetWidget() OVERRIDE { |
+ return View::GetWidget(); |
+ } |
+ virtual const views::Widget* GetWidget() const OVERRIDE { |
+ return View::GetWidget(); |
+ } |
// HtmlDialogTabContentsDelegate interface. |
- void MoveContents(TabContents* source, const gfx::Rect& pos) {} |
- void HandleKeyboardEvent(const NativeWebKeyboardEvent& event) {} |
+ void MoveContents(TabContents* source, const gfx::Rect& pos) OVERRIDE {} |
+ void HandleKeyboardEvent(const NativeWebKeyboardEvent& event) OVERRIDE {} |
// Overridden from TabContentsContainer. |
- virtual gfx::Size GetPreferredSize() { |
+ virtual gfx::Size GetPreferredSize() OVERRIDE { |
gfx::Size size; |
html_delegate_->GetDialogSize(&size); |
return size; |
@@ -49,7 +55,7 @@ |
virtual void ViewHierarchyChanged(bool is_add, |
views::View* parent, |
- views::View* child) { |
+ views::View* child) OVERRIDE { |
TabContentsContainer::ViewHierarchyChanged(is_add, parent, child); |
if (is_add && child == this) { |
ChangeTabContents(&html_tab_contents_); |