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

Side by Side Diff: ui/views/controls/menu/menu_controller_unittest.cc

Issue 1870573003: Full Keyboard Access: Second Approach (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
« no previous file with comments | « ui/views/controls/link.cc ('k') | ui/views/controls/scrollbar/native_scroll_bar_views.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/controls/menu/menu_controller.h" 5 #include "ui/views/controls/menu/menu_controller.h"
6 6
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
11 #include "ui/aura/scoped_window_targeter.h" 11 #include "ui/aura/scoped_window_targeter.h"
12 #include "ui/aura/window.h" 12 #include "ui/aura/window.h"
13 #include "ui/events/event.h" 13 #include "ui/events/event.h"
14 #include "ui/events/event_constants.h" 14 #include "ui/events/event_constants.h"
15 #include "ui/events/event_handler.h" 15 #include "ui/events/event_handler.h"
16 #include "ui/events/event_utils.h" 16 #include "ui/events/event_utils.h"
17 #include "ui/events/null_event_targeter.h" 17 #include "ui/events/null_event_targeter.h"
18 #include "ui/events/test/event_generator.h" 18 #include "ui/events/test/event_generator.h"
19 #include "ui/gfx/geometry/point.h" 19 #include "ui/gfx/geometry/point.h"
20 #include "ui/gfx/geometry/rect.h" 20 #include "ui/gfx/geometry/rect.h"
21 #include "ui/views/controls/menu/menu_controller_delegate.h" 21 #include "ui/views/controls/menu/menu_controller_delegate.h"
22 #include "ui/views/controls/menu/menu_delegate.h" 22 #include "ui/views/controls/menu/menu_delegate.h"
23 #include "ui/views/controls/menu/menu_item_view.h" 23 #include "ui/views/controls/menu/menu_item_view.h"
24 #include "ui/views/controls/menu/menu_message_loop.h" 24 #include "ui/views/controls/menu/menu_message_loop.h"
25 #include "ui/views/controls/menu/menu_scroll_view_container.h" 25 #include "ui/views/controls/menu/menu_scroll_view_container.h"
26 #include "ui/views/controls/menu/submenu_view.h" 26 #include "ui/views/controls/menu/submenu_view.h"
27 #include "ui/views/style/platform_style.h"
27 #include "ui/views/test/views_test_base.h" 28 #include "ui/views/test/views_test_base.h"
28 29
29 #if defined(USE_AURA) 30 #if defined(USE_AURA)
30 #include "ui/aura/scoped_window_targeter.h" 31 #include "ui/aura/scoped_window_targeter.h"
31 #include "ui/aura/window.h" 32 #include "ui/aura/window.h"
32 #include "ui/views/controls/menu/menu_key_event_handler.h" 33 #include "ui/views/controls/menu/menu_key_event_handler.h"
33 #endif 34 #endif
34 35
35 #if defined(USE_X11) 36 #if defined(USE_X11)
36 #include <X11/Xlib.h> 37 #include <X11/Xlib.h>
(...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after
448 return menu_controller_->exit_type_; 449 return menu_controller_->exit_type_;
449 } 450 }
450 451
451 void AddButtonMenuItems() { 452 void AddButtonMenuItems() {
452 menu_item()->SetBounds(0, 0, 200, 300); 453 menu_item()->SetBounds(0, 0, 200, 300);
453 MenuItemView* item_view = 454 MenuItemView* item_view =
454 menu_item()->AppendMenuItemWithLabel(5, base::ASCIIToUTF16("Five")); 455 menu_item()->AppendMenuItemWithLabel(5, base::ASCIIToUTF16("Five"));
455 for (int i = 0; i < 3; ++i) { 456 for (int i = 0; i < 3; ++i) {
456 LabelButton* button = 457 LabelButton* button =
457 new LabelButton(nullptr, base::ASCIIToUTF16("Label")); 458 new LabelButton(nullptr, base::ASCIIToUTF16("Label"));
458 button->SetFocusable(true); 459 PlatformStyle::ConfigureFocus(PlatformStyle::CONTROL::BUTTON, button);
459 item_view->AddChildView(button); 460 item_view->AddChildView(button);
460 } 461 }
461 menu_item()->GetSubmenu()->ShowAt(owner(), menu_item()->bounds(), false); 462 menu_item()->GetSubmenu()->ShowAt(owner(), menu_item()->bounds(), false);
462 } 463 }
463 464
464 CustomButton* GetHotButton() { 465 CustomButton* GetHotButton() {
465 return menu_controller_->hot_button_; 466 return menu_controller_->hot_button_;
466 } 467 }
467 468
468 void SetHotTrackedButton(CustomButton* hot_button) { 469 void SetHotTrackedButton(CustomButton* hot_button) {
(...skipping 764 matching lines...) Expand 10 before | Expand all | Expand 10 after
1233 DestroyMenuControllerOnMenuClosed(nested_delegate.get()); 1234 DestroyMenuControllerOnMenuClosed(nested_delegate.get());
1234 controller->OnGestureEvent(sub_menu, &event); 1235 controller->OnGestureEvent(sub_menu, &event);
1235 1236
1236 // Close to remove observers before test TearDown 1237 // Close to remove observers before test TearDown
1237 sub_menu->Close(); 1238 sub_menu->Close();
1238 EXPECT_EQ(1, nested_delegate->on_menu_closed_called()); 1239 EXPECT_EQ(1, nested_delegate->on_menu_closed_called());
1239 } 1240 }
1240 1241
1241 } // namespace test 1242 } // namespace test
1242 } // namespace views 1243 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/controls/link.cc ('k') | ui/views/controls/scrollbar/native_scroll_bar_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698