diff options
author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-16 22:10:46 +0000 |
---|---|---|
committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-16 22:10:46 +0000 |
commit | 080440cebdc80def86dd88356e5922946cc11a79 (patch) | |
tree | 6da09cd9a2b69e79075f0d391179d0757ac04620 /views/desktop | |
parent | bc9b2f4215e0ee88e0faaa42a1f116231ce2a311 (diff) | |
download | chromium_src-080440cebdc80def86dd88356e5922946cc11a79.zip chromium_src-080440cebdc80def86dd88356e5922946cc11a79.tar.gz chromium_src-080440cebdc80def86dd88356e5922946cc11a79.tar.bz2 |
Fix even more crashes. To help identify remaining crashes now and in the future, I have made the GetWidget methods on WidgetDelegate pure virtual. This will cause classes that don't define them to fail compile instead of crashing at run time.
http://crbug.com/86119
TEST=none
Review URL: http://codereview.chromium.org/7189019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89409 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/desktop')
-rw-r--r-- | views/desktop/desktop_window.cc | 3 | ||||
-rw-r--r-- | views/desktop/desktop_window.h | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/views/desktop/desktop_window.cc b/views/desktop/desktop_window.cc index 7260826..773d34c 100644 --- a/views/desktop/desktop_window.cc +++ b/views/desktop/desktop_window.cc @@ -39,8 +39,7 @@ class DesktopWindowWindow : public Widget { DISALLOW_COPY_AND_ASSIGN(DesktopWindowWindow); }; -class TestWindowContentView : public View, - public WidgetDelegate { +class TestWindowContentView : public WidgetDelegateView { public: TestWindowContentView(const std::wstring& title, SkColor color) : title_(title), diff --git a/views/desktop/desktop_window.h b/views/desktop/desktop_window.h index 453030c..eb49f44 100644 --- a/views/desktop/desktop_window.h +++ b/views/desktop/desktop_window.h @@ -13,8 +13,7 @@ class NativeWidgetViews; namespace desktop { -class DesktopWindow : public View, - public WidgetDelegate { +class DesktopWindow : public WidgetDelegateView { public: DesktopWindow(); virtual ~DesktopWindow(); |