Index: ui/views/test/desktop_test_views_delegate_mac.mm |
diff --git a/ui/views/test/desktop_test_views_delegate.cc b/ui/views/test/desktop_test_views_delegate_mac.mm |
similarity index 64% |
rename from ui/views/test/desktop_test_views_delegate.cc |
rename to ui/views/test/desktop_test_views_delegate_mac.mm |
index b71b0f3c22f7b23793d22a9204c8073a09e22b9d..0349d6f1cf4fefb46007d6e99031e3fc45023d55 100644 |
--- a/ui/views/test/desktop_test_views_delegate.cc |
+++ b/ui/views/test/desktop_test_views_delegate_mac.mm |
@@ -1,14 +1,10 @@ |
-// Copyright (c) 2012 The Chromium Authors. All rights reserved. |
+// Copyright 2014 The Chromium Authors. All rights reserved. |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
#include "ui/views/test/desktop_test_views_delegate.h" |
-#include "ui/views/widget/native_widget_aura.h" |
- |
-#if !defined(OS_CHROMEOS) |
-#include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" |
-#endif |
+#include "ui/views/widget/native_widget_mac.h" |
namespace views { |
@@ -19,18 +15,18 @@ DesktopTestViewsDelegate::~DesktopTestViewsDelegate() {} |
void DesktopTestViewsDelegate::OnBeforeWidgetInit( |
Widget::InitParams* params, |
internal::NativeWidgetDelegate* delegate) { |
-#if !defined(OS_CHROMEOS) |
// If we already have a native_widget, we don't have to try to come |
// up with one. |
if (params->native_widget) |
return; |
if (params->parent && params->type != views::Widget::InitParams::TYPE_MENU) { |
- params->native_widget = new views::NativeWidgetAura(delegate); |
+ params->native_widget = new NativeWidgetMac(delegate); |
} else if (!params->parent && !params->context) { |
- params->native_widget = new views::DesktopNativeWidgetAura(delegate); |
+ NOTIMPLEMENTED(); |
+ // TODO(tapted): Implement DesktopNativeWidgetAura. |
+ params->native_widget = new NativeWidgetMac(delegate); |
} |
-#endif |
} |
} // namespace views |