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

Side by Side Diff: ui/views/widget/widget_interactive_uitest.cc

Issue 136643006: Clean up some ifdefs around Win Aura. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 6 years, 10 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
« no previous file with comments | « ui/views/event_utils.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/bind.h" 6 #include "base/bind.h"
7 #include "base/run_loop.h" 7 #include "base/run_loop.h"
8 #include "ui/gfx/native_widget_types.h" 8 #include "ui/gfx/native_widget_types.h"
9 #include "ui/views/test/widget_test.h" 9 #include "ui/views/test/widget_test.h"
10 #include "ui/views/widget/widget.h" 10 #include "ui/views/widget/widget.h"
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 return true; 141 return true;
142 } 142 }
143 143
144 Widget* widget_; 144 Widget* widget_;
145 145
146 DISALLOW_COPY_AND_ASSIGN(NestedLoopCaptureView); 146 DISALLOW_COPY_AND_ASSIGN(NestedLoopCaptureView);
147 }; 147 };
148 148
149 } // namespace 149 } // namespace
150 150
151 #if defined(OS_WIN) && defined(USE_AURA) 151 #if defined(OS_WIN)
152 // Tests whether activation and focus change works correctly in Windows AURA. 152 // Tests whether activation and focus change works correctly in Windows.
153 // We test the following:- 153 // We test the following:-
154 // 1. If the active aura window is correctly set when a top level widget is 154 // 1. If the active aura window is correctly set when a top level widget is
155 // created. 155 // created.
156 // 2. If the active aura window in widget 1 created above, is set to NULL when 156 // 2. If the active aura window in widget 1 created above, is set to NULL when
157 // another top level widget is created and focused. 157 // another top level widget is created and focused.
158 // 3. On focusing the native platform window for widget 1, the active aura 158 // 3. On focusing the native platform window for widget 1, the active aura
159 // window for widget 1 should be set and that for widget 2 should reset. 159 // window for widget 1 should be set and that for widget 2 should reset.
160 // TODO(ananta) 160 // TODO(ananta)
161 // Discuss with erg on how to write this test for linux x11 aura. 161 // Discuss with erg on how to write this test for linux x11 aura.
162 TEST_F(WidgetTest, DesktopNativeWidgetAuraActivationAndFocusTest) { 162 TEST_F(WidgetTest, DesktopNativeWidgetAuraActivationAndFocusTest) {
(...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after
783 ui::EventDispatchDetails details = widget1.GetNativeWindow()-> 783 ui::EventDispatchDetails details = widget1.GetNativeWindow()->
784 GetDispatcher()->OnEventFromSource(&mouse_event); 784 GetDispatcher()->OnEventFromSource(&mouse_event);
785 ASSERT_FALSE(details.dispatcher_destroyed); 785 ASSERT_FALSE(details.dispatcher_destroyed);
786 EXPECT_TRUE(widget1.GetAndClearGotMouseEvent()); 786 EXPECT_TRUE(widget1.GetAndClearGotMouseEvent());
787 EXPECT_FALSE(widget2.GetAndClearGotMouseEvent()); 787 EXPECT_FALSE(widget2.GetAndClearGotMouseEvent());
788 } 788 }
789 #endif 789 #endif
790 790
791 } // namespace test 791 } // namespace test
792 } // namespace views 792 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/event_utils.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698