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

Side by Side Diff: ui/views/focus/focus_manager_unittest.cc

Issue 444583002: MacViews: Get widget_interactive_uitest compiling on Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Try FocusListener Created 6 years, 4 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/focus/focus_manager_test.cc ('k') | ui/views/focus/focus_traversal_unittest.cc » ('j') | 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ui/views/focus/focus_manager.h" 5 #include "ui/views/focus/focus_manager.h"
6 6
7 #include <utility> 7 #include <utility>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/strings/utf_string_conversions.h" 11 #include "base/strings/utf_string_conversions.h"
12 #include "ui/aura/client/focus_client.h" 12 #include "ui/aura/client/focus_client.h"
13 #include "ui/aura/window.h" 13 #include "ui/aura/window.h"
14 #include "ui/base/accelerators/accelerator.h" 14 #include "ui/base/accelerators/accelerator.h"
15 #include "ui/base/ime/dummy_text_input_client.h" 15 #include "ui/base/ime/dummy_text_input_client.h"
16 #include "ui/base/ime/text_input_focus_manager.h" 16 #include "ui/base/ime/text_input_focus_manager.h"
17 #include "ui/base/ui_base_switches.h" 17 #include "ui/base/ui_base_switches.h"
18 #include "ui/events/keycodes/keyboard_codes.h" 18 #include "ui/events/keycodes/keyboard_codes.h"
19 #include "ui/views/accessible_pane_view.h" 19 #include "ui/views/accessible_pane_view.h"
20 #include "ui/views/controls/button/label_button.h" 20 #include "ui/views/controls/button/label_button.h"
21 #include "ui/views/focus/focus_manager_factory.h" 21 #include "ui/views/focus/focus_manager_factory.h"
22 #include "ui/views/focus/focus_manager_test.h"
23 #include "ui/views/focus/widget_focus_manager.h" 22 #include "ui/views/focus/widget_focus_manager.h"
23 #include "ui/views/test/focus_manager_test.h"
24 #include "ui/views/widget/widget.h" 24 #include "ui/views/widget/widget.h"
25 25
26 namespace views { 26 namespace views {
27 27
28 enum FocusTestEventType { 28 enum FocusTestEventType {
29 ON_FOCUS = 0, 29 ON_FOCUS = 0,
30 ON_BLUR 30 ON_BLUR
31 }; 31 };
32 32
33 struct FocusTestEvent { 33 struct FocusTestEvent {
(...skipping 877 matching lines...) Expand 10 before | Expand all | Expand 10 after
911 EXPECT_EQ(view1, GetFocusManager()->GetFocusedView()); 911 EXPECT_EQ(view1, GetFocusManager()->GetFocusedView());
912 912
913 // Allow focus to go to the parent, and focus backwards which should now move 913 // Allow focus to go to the parent, and focus backwards which should now move
914 // up |widget_view| (in the parent). 914 // up |widget_view| (in the parent).
915 delegate->set_should_advance_focus_to_parent(true); 915 delegate->set_should_advance_focus_to_parent(true);
916 GetFocusManager()->AdvanceFocus(true); 916 GetFocusManager()->AdvanceFocus(true);
917 EXPECT_EQ(widget_view, GetFocusManager()->GetFocusedView()); 917 EXPECT_EQ(widget_view, GetFocusManager()->GetFocusedView());
918 } 918 }
919 919
920 } // namespace views 920 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/focus/focus_manager_test.cc ('k') | ui/views/focus/focus_traversal_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698