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

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

Issue 2010083002: views/mus: Run some more tests from views_unittests in mus. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 6 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/button/menu_button_unittest.cc ('k') | ui/views/controls/slider_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 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"
(...skipping 465 matching lines...) Expand 10 before | Expand all | Expand 10 after
476 delete menu_controller_; 476 delete menu_controller_;
477 menu_controller_ = nullptr; 477 menu_controller_ = nullptr;
478 } 478 }
479 479
480 void Init() { 480 void Init() {
481 owner_.reset(new Widget); 481 owner_.reset(new Widget);
482 Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP); 482 Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
483 params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; 483 params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
484 owner_->Init(params); 484 owner_->Init(params);
485 event_generator_.reset( 485 event_generator_.reset(
486 new ui::test::EventGenerator(GetContext(), owner_->GetNativeWindow())); 486 new ui::test::EventGenerator(owner_->GetNativeWindow()));
487 owner_->Show(); 487 owner_->Show();
488 488
489 SetupMenuItem(); 489 SetupMenuItem();
490 SetupMenuController(); 490 SetupMenuController();
491 } 491 }
492 492
493 void SetupMenuItem() { 493 void SetupMenuItem() {
494 menu_delegate_.reset(new TestMenuDelegate); 494 menu_delegate_.reset(new TestMenuDelegate);
495 menu_item_.reset(new TestMenuItemViewShown(menu_delegate_.get())); 495 menu_item_.reset(new TestMenuItemViewShown(menu_delegate_.get()));
496 menu_item_->AppendMenuItemWithLabel(1, base::ASCIIToUTF16("One")); 496 menu_item_->AppendMenuItemWithLabel(1, base::ASCIIToUTF16("One"));
(...skipping 748 matching lines...) Expand 10 before | Expand all | Expand 10 after
1245 // This creates a nested message loop. 1245 // This creates a nested message loop.
1246 EXPECT_EQ(nullptr, menu_controller()->Run(owner(), nullptr, menu_item(), 1246 EXPECT_EQ(nullptr, menu_controller()->Run(owner(), nullptr, menu_item(),
1247 gfx::Rect(), MENU_ANCHOR_TOPLEFT, 1247 gfx::Rect(), MENU_ANCHOR_TOPLEFT,
1248 false, false, &result_event_flags)); 1248 false, false, &result_event_flags));
1249 EXPECT_FALSE(menu_controller_delegate()->on_menu_closed_called()); 1249 EXPECT_FALSE(menu_controller_delegate()->on_menu_closed_called());
1250 EXPECT_TRUE(nested_delegate->on_menu_closed_called()); 1250 EXPECT_TRUE(nested_delegate->on_menu_closed_called());
1251 } 1251 }
1252 1252
1253 } // namespace test 1253 } // namespace test
1254 } // namespace views 1254 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/controls/button/menu_button_unittest.cc ('k') | ui/views/controls/slider_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698