Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1333)

Unified Diff: chrome/browser/ui/views/constrained_html_delegate_win.cc

Issue 7189019: Fix even more crashes. To help identify remaining crashes now and in the future, I have made the ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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_);

Powered by Google App Engine
This is Rietveld 408576698