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

Side by Side Diff: ui/views/accessibility/native_view_accessibility_win_unittest.cc

Issue 191723003: Nukes USE_AURA ifdefs from views (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanup Created 6 years, 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <oleacc.h> 5 #include <oleacc.h>
6 6
7 #include "base/win/scoped_bstr.h" 7 #include "base/win/scoped_bstr.h"
8 #include "base/win/scoped_comptr.h" 8 #include "base/win/scoped_comptr.h"
9 #include "base/win/scoped_variant.h" 9 #include "base/win/scoped_variant.h"
10 #include "ui/views/accessibility/native_view_accessibility.h" 10 #include "ui/views/accessibility/native_view_accessibility.h"
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 base::win::ScopedComPtr<IAccessible> web_view_accessible( 84 base::win::ScopedComPtr<IAccessible> web_view_accessible(
85 web_view->GetNativeViewAccessible()); 85 web_view->GetNativeViewAccessible());
86 base::win::ScopedComPtr<IDispatch> result_dispatch; 86 base::win::ScopedComPtr<IDispatch> result_dispatch;
87 base::win::ScopedVariant child_index(-999); 87 base::win::ScopedVariant child_index(-999);
88 ASSERT_EQ(E_FAIL, web_view_accessible->get_accChild( 88 ASSERT_EQ(E_FAIL, web_view_accessible->get_accChild(
89 child_index, result_dispatch.Receive())); 89 child_index, result_dispatch.Receive()));
90 90
91 NativeViewAccessibility::UnregisterWebView(web_view); 91 NativeViewAccessibility::UnregisterWebView(web_view);
92 } 92 }
93 93
94 #if defined(USE_AURA)
95 TEST_F(NativeViewAcccessibilityWinTest, AuraOwnedWidgets) { 94 TEST_F(NativeViewAcccessibilityWinTest, AuraOwnedWidgets) {
96 Widget widget; 95 Widget widget;
97 Widget::InitParams init_params = 96 Widget::InitParams init_params =
98 CreateParams(Widget::InitParams::TYPE_WINDOW); 97 CreateParams(Widget::InitParams::TYPE_WINDOW);
99 init_params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; 98 init_params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
100 widget.Init(init_params); 99 widget.Init(init_params);
101 100
102 base::win::ScopedComPtr<IAccessible> root_view_accessible( 101 base::win::ScopedComPtr<IAccessible> root_view_accessible(
103 widget.GetRootView()->GetNativeViewAccessible()); 102 widget.GetRootView()->GetNativeViewAccessible());
104 103
105 LONG child_count = 0; 104 LONG child_count = 0;
106 ASSERT_EQ(S_OK, root_view_accessible->get_accChildCount(&child_count)); 105 ASSERT_EQ(S_OK, root_view_accessible->get_accChildCount(&child_count));
107 ASSERT_EQ(1L, child_count); 106 ASSERT_EQ(1L, child_count);
108 107
109 Widget owned_widget; 108 Widget owned_widget;
110 Widget::InitParams owned_init_params = 109 Widget::InitParams owned_init_params =
111 CreateParams(Widget::InitParams::TYPE_POPUP); 110 CreateParams(Widget::InitParams::TYPE_POPUP);
112 owned_init_params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; 111 owned_init_params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
113 owned_init_params.child = false; 112 owned_init_params.child = false;
114 owned_init_params.parent = widget.GetNativeView(); 113 owned_init_params.parent = widget.GetNativeView();
115 owned_widget.Init(owned_init_params); 114 owned_widget.Init(owned_init_params);
116 owned_widget.Show(); 115 owned_widget.Show();
117 116
118 ASSERT_EQ(S_OK, root_view_accessible->get_accChildCount(&child_count)); 117 ASSERT_EQ(S_OK, root_view_accessible->get_accChildCount(&child_count));
119 ASSERT_EQ(2L, child_count); 118 ASSERT_EQ(2L, child_count);
120 } 119 }
121 #endif
122 120
123 } // namespace test 121 } // namespace test
124 } // namespace views 122 } // namespace views
OLDNEW
« no previous file with comments | « no previous file | ui/views/accessible_pane_view_unittest.cc » ('j') | ui/views/controls/native/native_view_host.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698