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

Unified Diff: views/focus/focus_manager_unittest.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: views/focus/focus_manager_unittest.cc
===================================================================
--- views/focus/focus_manager_unittest.cc (revision 89357)
+++ views/focus/focus_manager_unittest.cc (working copy)
@@ -116,13 +116,13 @@
#endif
}
- virtual void SetUp() {
+ virtual void SetUp() OVERRIDE {
window_ = Widget::CreateWindowWithBounds(this, bounds());
InitContentView();
window_->Show();
}
- virtual void TearDown() {
+ virtual void TearDown() OVERRIDE {
if (focus_change_listener_)
GetFocusManager()->RemoveFocusChangeListener(focus_change_listener_);
window_->Close();
@@ -152,11 +152,17 @@
}
// WidgetDelegate Implementation.
- virtual View* GetContentsView() {
+ virtual View* GetContentsView() OVERRIDE {
if (!content_view_)
content_view_ = new View();
return content_view_;
}
+ virtual Widget* GetWidget() OVERRIDE {
+ return content_view_->GetWidget();
+ }
+ virtual const Widget* GetWidget() const OVERRIDE {
+ return content_view_->GetWidget();
+ }
virtual void InitContentView() {
}

Powered by Google App Engine
This is Rietveld 408576698