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

Unified Diff: ui/views/test/desktop_test_views_delegate_mac.mm

Issue 297143009: MacViews: Gets views_examples_with_content_exe compiling on Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase to master Created 6 years, 7 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/desktop_test_views_delegate_aura.cc ('k') | ui/views/views.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « ui/views/test/desktop_test_views_delegate_aura.cc ('k') | ui/views/views.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698