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

Unified Diff: ui/views/test/widget_test.cc

Issue 1254963010: [Views] Move modality tests from widget_unittest.cc to desktop_native_widget_aura_unittest.cc. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments. Created 5 years, 5 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
« no previous file with comments | « ui/views/test/widget_test.h ('k') | ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/test/widget_test.cc
diff --git a/ui/views/test/widget_test.cc b/ui/views/test/widget_test.cc
index 57fc8c3765e5e953dea3572bbcd93a7077c367f0..66cf6e55777e428fe09b0139e7f951fbf1fcdb1a 100644
--- a/ui/views/test/widget_test.cc
+++ b/ui/views/test/widget_test.cc
@@ -111,5 +111,44 @@ View* WidgetTest::GetGestureHandler(internal::RootView* root_view) {
return root_view->gesture_handler_;
}
+TestDesktopWidgetDelegate::TestDesktopWidgetDelegate() : widget_(new Widget) {
+}
+
+TestDesktopWidgetDelegate::~TestDesktopWidgetDelegate() {
+ if (widget_)
+ widget_->CloseNow();
+ EXPECT_FALSE(widget_);
+}
+
+void TestDesktopWidgetDelegate::InitWidget(Widget::InitParams init_params) {
+ init_params.delegate = this;
+#if !defined(OS_CHROMEOS)
+ init_params.native_widget = new PlatformDesktopNativeWidget(widget_);
+#endif
+ init_params.bounds = initial_bounds_;
+ widget_->Init(init_params);
+}
+
+void TestDesktopWidgetDelegate::WindowClosing() {
+ window_closing_count_++;
+ widget_ = nullptr;
+}
+
+Widget* TestDesktopWidgetDelegate::GetWidget() {
+ return widget_;
+}
+
+const Widget* TestDesktopWidgetDelegate::GetWidget() const {
+ return widget_;
+}
+
+View* TestDesktopWidgetDelegate::GetContentsView() {
+ return contents_view_ ? contents_view_ : WidgetDelegate::GetContentsView();
+}
+
+bool TestDesktopWidgetDelegate::ShouldAdvanceFocusToTopLevelWidget() const {
+ return true; // Same default as DefaultWidgetDelegate in widget.cc.
+}
+
} // namespace test
} // namespace views
« no previous file with comments | « ui/views/test/widget_test.h ('k') | ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698