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 1543173002: Switch to standard integer types in ui/views/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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
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/macros.h"
7 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "build/build_config.h"
8 #include "ui/aura/scoped_window_targeter.h" 10 #include "ui/aura/scoped_window_targeter.h"
9 #include "ui/aura/window.h" 11 #include "ui/aura/window.h"
10 #include "ui/events/event_handler.h" 12 #include "ui/events/event_handler.h"
11 #include "ui/events/null_event_targeter.h" 13 #include "ui/events/null_event_targeter.h"
12 #include "ui/events/test/event_generator.h" 14 #include "ui/events/test/event_generator.h"
13 #include "ui/views/controls/menu/menu_controller_delegate.h" 15 #include "ui/views/controls/menu/menu_controller_delegate.h"
14 #include "ui/views/controls/menu/menu_delegate.h" 16 #include "ui/views/controls/menu/menu_delegate.h"
15 #include "ui/views/controls/menu/menu_item_view.h" 17 #include "ui/views/controls/menu/menu_item_view.h"
16 #include "ui/views/controls/menu/submenu_view.h" 18 #include "ui/views/controls/menu/submenu_view.h"
17 #include "ui/views/test/views_test_base.h" 19 #include "ui/views/test/views_test_base.h"
(...skipping 577 matching lines...) Expand 10 before | Expand all | Expand 10 after
595 EXPECT_EQ(1, nested_delegate->on_menu_closed_called()); 597 EXPECT_EQ(1, nested_delegate->on_menu_closed_called());
596 EXPECT_EQ(nullptr, nested_delegate->on_menu_closed_menu()); 598 EXPECT_EQ(nullptr, nested_delegate->on_menu_closed_menu());
597 EXPECT_EQ(0, nested_delegate->on_menu_closed_mouse_event_flags()); 599 EXPECT_EQ(0, nested_delegate->on_menu_closed_mouse_event_flags());
598 EXPECT_EQ(internal::MenuControllerDelegate::NOTIFY_DELEGATE, 600 EXPECT_EQ(internal::MenuControllerDelegate::NOTIFY_DELEGATE,
599 nested_delegate->on_menu_closed_notify_type()); 601 nested_delegate->on_menu_closed_notify_type());
600 EXPECT_EQ(MenuController::EXIT_ALL, controller->exit_type()); 602 EXPECT_EQ(MenuController::EXIT_ALL, controller->exit_type());
601 } 603 }
602 604
603 } // namespace test 605 } // namespace test
604 } // namespace views 606 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698