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

Unified Diff: views/widget/widget_unittest.cc

Issue 7996008: Get views and views_unittests to build w/ use_aura=1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed review issue Created 9 years, 3 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 | « views/views.gyp ('k') | views/window/dialog_client_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/widget/widget_unittest.cc
diff --git a/views/widget/widget_unittest.cc b/views/widget/widget_unittest.cc
index a9f43dcb2b156e3a3ef2e32dcd0febdb9dd8e4da..202e0de7dd829eef4eefd27b599b7e29dbf827b7 100644
--- a/views/widget/widget_unittest.cc
+++ b/views/widget/widget_unittest.cc
@@ -157,12 +157,12 @@ bool WidgetHasMouseCapture(const Widget* widget) {
TEST_F(WidgetTest, GetTopLevelWidget_Native) {
// Create a hierarchy of native widgets.
Widget* toplevel = CreateTopLevelPlatformWidget();
-#if defined(OS_WIN)
- gfx::NativeView parent = toplevel->GetNativeView();
-#elif defined(TOOLKIT_USES_GTK)
+#if defined(TOOLKIT_USES_GTK)
NativeWidgetGtk* native_widget =
static_cast<NativeWidgetGtk*>(toplevel->native_widget());
gfx::NativeView parent = native_widget->window_contents();
+#else
+ gfx::NativeView parent = toplevel->GetNativeView();
#endif
Widget* child = CreateChildPlatformWidget(parent);
« no previous file with comments | « views/views.gyp ('k') | views/window/dialog_client_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698