| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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_runner.h" | 5 #include "ui/views/controls/menu/menu_runner.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include <memory> |
| 10 |
| 9 #include "base/macros.h" | 11 #include "base/macros.h" |
| 10 #include "base/memory/scoped_ptr.h" | |
| 11 #include "base/strings/utf_string_conversions.h" | 12 #include "base/strings/utf_string_conversions.h" |
| 12 #include "ui/base/ui_base_types.h" | 13 #include "ui/base/ui_base_types.h" |
| 13 #include "ui/events/test/event_generator.h" | 14 #include "ui/events/test/event_generator.h" |
| 14 #include "ui/views/controls/menu/menu_delegate.h" | 15 #include "ui/views/controls/menu/menu_delegate.h" |
| 15 #include "ui/views/controls/menu/menu_item_view.h" | 16 #include "ui/views/controls/menu/menu_item_view.h" |
| 16 #include "ui/views/controls/menu/menu_types.h" | 17 #include "ui/views/controls/menu/menu_types.h" |
| 17 #include "ui/views/controls/menu/submenu_view.h" | 18 #include "ui/views/controls/menu/submenu_view.h" |
| 18 #include "ui/views/test/views_test_base.h" | 19 #include "ui/views/test/views_test_base.h" |
| 19 #include "ui/views/widget/widget.h" | 20 #include "ui/views/widget/widget.h" |
| 20 | 21 |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 88 Widget* owner() { return owner_.get(); } | 89 Widget* owner() { return owner_.get(); } |
| 89 | 90 |
| 90 // ViewsTestBase: | 91 // ViewsTestBase: |
| 91 void SetUp() override; | 92 void SetUp() override; |
| 92 void TearDown() override; | 93 void TearDown() override; |
| 93 | 94 |
| 94 private: | 95 private: |
| 95 // Owned by MenuRunner. | 96 // Owned by MenuRunner. |
| 96 MenuItemView* menu_item_view_; | 97 MenuItemView* menu_item_view_; |
| 97 | 98 |
| 98 scoped_ptr<TestMenuDelegate> menu_delegate_; | 99 std::unique_ptr<TestMenuDelegate> menu_delegate_; |
| 99 scoped_ptr<MenuRunner> menu_runner_; | 100 std::unique_ptr<MenuRunner> menu_runner_; |
| 100 scoped_ptr<Widget> owner_; | 101 std::unique_ptr<Widget> owner_; |
| 101 | 102 |
| 102 DISALLOW_COPY_AND_ASSIGN(MenuRunnerTest); | 103 DISALLOW_COPY_AND_ASSIGN(MenuRunnerTest); |
| 103 }; | 104 }; |
| 104 | 105 |
| 105 MenuRunnerTest::MenuRunnerTest() {} | 106 MenuRunnerTest::MenuRunnerTest() {} |
| 106 | 107 |
| 107 MenuRunnerTest::~MenuRunnerTest() {} | 108 MenuRunnerTest::~MenuRunnerTest() {} |
| 108 | 109 |
| 109 void MenuRunnerTest::InitMenuRunner(int32_t run_types) { | 110 void MenuRunnerTest::InitMenuRunner(int32_t run_types) { |
| 110 menu_runner_.reset(new MenuRunner(menu_item_view_, run_types)); | 111 menu_runner_.reset(new MenuRunner(menu_item_view_, run_types)); |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 213 // cause a crash. Instead the drag and drop action should be canceled, and the | 214 // cause a crash. Instead the drag and drop action should be canceled, and the |
| 214 // new menu should be openned. | 215 // new menu should be openned. |
| 215 TEST_F(MenuRunnerTest, NestingDuringDrag) { | 216 TEST_F(MenuRunnerTest, NestingDuringDrag) { |
| 216 InitMenuRunner(MenuRunner::FOR_DROP); | 217 InitMenuRunner(MenuRunner::FOR_DROP); |
| 217 MenuRunner* runner = menu_runner(); | 218 MenuRunner* runner = menu_runner(); |
| 218 MenuRunner::RunResult result = runner->RunMenuAt( | 219 MenuRunner::RunResult result = runner->RunMenuAt( |
| 219 owner(), nullptr, gfx::Rect(), MENU_ANCHOR_TOPLEFT, ui::MENU_SOURCE_NONE); | 220 owner(), nullptr, gfx::Rect(), MENU_ANCHOR_TOPLEFT, ui::MENU_SOURCE_NONE); |
| 220 EXPECT_EQ(MenuRunner::NORMAL_EXIT, result); | 221 EXPECT_EQ(MenuRunner::NORMAL_EXIT, result); |
| 221 EXPECT_TRUE(runner->IsRunning()); | 222 EXPECT_TRUE(runner->IsRunning()); |
| 222 | 223 |
| 223 scoped_ptr<TestMenuDelegate> nested_delegate(new TestMenuDelegate); | 224 std::unique_ptr<TestMenuDelegate> nested_delegate(new TestMenuDelegate); |
| 224 MenuItemView* nested_menu = new MenuItemView(nested_delegate.get()); | 225 MenuItemView* nested_menu = new MenuItemView(nested_delegate.get()); |
| 225 scoped_ptr<MenuRunner> nested_runner( | 226 std::unique_ptr<MenuRunner> nested_runner( |
| 226 new MenuRunner(nested_menu, MenuRunner::IS_NESTED | MenuRunner::ASYNC)); | 227 new MenuRunner(nested_menu, MenuRunner::IS_NESTED | MenuRunner::ASYNC)); |
| 227 result = nested_runner->RunMenuAt(owner(), nullptr, gfx::Rect(), | 228 result = nested_runner->RunMenuAt(owner(), nullptr, gfx::Rect(), |
| 228 MENU_ANCHOR_TOPLEFT, ui::MENU_SOURCE_NONE); | 229 MENU_ANCHOR_TOPLEFT, ui::MENU_SOURCE_NONE); |
| 229 EXPECT_EQ(MenuRunner::NORMAL_EXIT, result); | 230 EXPECT_EQ(MenuRunner::NORMAL_EXIT, result); |
| 230 EXPECT_TRUE(nested_runner->IsRunning()); | 231 EXPECT_TRUE(nested_runner->IsRunning()); |
| 231 EXPECT_FALSE(runner->IsRunning()); | 232 EXPECT_FALSE(runner->IsRunning()); |
| 232 TestMenuDelegate* delegate = menu_delegate(); | 233 TestMenuDelegate* delegate = menu_delegate(); |
| 233 EXPECT_EQ(1, delegate->on_menu_closed_called()); | 234 EXPECT_EQ(1, delegate->on_menu_closed_called()); |
| 234 EXPECT_NE(nullptr, delegate->on_menu_closed_menu()); | 235 EXPECT_NE(nullptr, delegate->on_menu_closed_menu()); |
| 235 EXPECT_EQ(MenuRunner::NORMAL_EXIT, delegate->on_menu_closed_run_result()); | 236 EXPECT_EQ(MenuRunner::NORMAL_EXIT, delegate->on_menu_closed_run_result()); |
| 236 } | 237 } |
| 237 | 238 |
| 238 } // namespace test | 239 } // namespace test |
| 239 } // namespace views | 240 } // namespace views |
| OLD | NEW |