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 /chrome/browser/chromeos | |
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 'chrome/browser/chromeos')
-rw-r--r-- | chrome/browser/chromeos/login/user_controller.cc | 15 | ||||
-rw-r--r-- | chrome/browser/chromeos/login/user_controller.h | 2 |
2 files changed, 17 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/login/user_controller.cc b/chrome/browser/chromeos/login/user_controller.cc index 63a7a9f..b513997 100644 --- a/chrome/browser/chromeos/login/user_controller.cc +++ b/chrome/browser/chromeos/login/user_controller.cc @@ -74,6 +74,13 @@ class UserController::ControlsWidgetDelegate : public views::WidgetDelegate { controller_->OnWidgetActivated(active); } + virtual views::Widget* GetWidget() OVERRIDE { + return view_->GetWidget(); + } + virtual const views::Widget* GetWidget() const OVERRIDE { + return view_->GetWidget(); + } + private: UserController* controller_; @@ -261,6 +268,14 @@ void UserController::OnWidgetActivated(bool active) { } } +views::Widget* UserController::GetWidget() { + return NULL; +} + +const views::Widget* UserController::GetWidget() const { + return NULL; +} + //////////////////////////////////////////////////////////////////////////////// // UserController, NewUserView::Delegate implementation: // diff --git a/chrome/browser/chromeos/login/user_controller.h b/chrome/browser/chromeos/login/user_controller.h index a2b24e8..4f3ca49 100644 --- a/chrome/browser/chromeos/login/user_controller.h +++ b/chrome/browser/chromeos/login/user_controller.h @@ -110,6 +110,8 @@ class UserController : public views::WidgetDelegate, // views::WidgetDelegate implementation: virtual void OnWidgetActivated(bool active) OVERRIDE; + virtual views::Widget* GetWidget() OVERRIDE; + virtual const views::Widget* GetWidget() const OVERRIDE; // NewUserView::Delegate implementation: virtual void OnLogin(const std::string& username, |