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

Side by Side Diff: ui/views/event_monitor_unittest.cc

Issue 2505943002: MacViews: Fix accelerator handling while Omnibox is in focus. (Closed)
Patch Set: Fix tapted's review issues. Created 4 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 "base/macros.h" 5 #include "base/macros.h"
6 #include "ui/events/test/event_generator.h" 6 #include "ui/events/test/event_generator.h"
7 #include "ui/events/test/test_event_handler.h" 7 #include "ui/events/test/test_event_handler.h"
8 #include "ui/views/event_monitor.h" 8 #include "ui/views/event_monitor.h"
9 #include "ui/views/test/widget_test.h" 9 #include "ui/views/test/widget_test.h"
10 10
(...skipping 10 matching lines...) Expand all
21 widget_ = CreateTopLevelNativeWidget(); 21 widget_ = CreateTopLevelNativeWidget();
22 widget_->SetSize(gfx::Size(100, 100)); 22 widget_->SetSize(gfx::Size(100, 100));
23 widget_->Show(); 23 widget_->Show();
24 if (IsMus() || IsAuraMusClient()) { 24 if (IsMus() || IsAuraMusClient()) {
25 generator_.reset( 25 generator_.reset(
26 new ui::test::EventGenerator(widget_->GetNativeWindow())); 26 new ui::test::EventGenerator(widget_->GetNativeWindow()));
27 } else { 27 } else {
28 generator_.reset(new ui::test::EventGenerator( 28 generator_.reset(new ui::test::EventGenerator(
29 GetContext(), widget_->GetNativeWindow())); 29 GetContext(), widget_->GetNativeWindow()));
30 } 30 }
31 generator_->set_targeting_application(true); 31 generator_->set_target(ui::test::EventGenerator::Target::APPLICATION);
32 } 32 }
33 void TearDown() override { 33 void TearDown() override {
34 widget_->CloseNow(); 34 widget_->CloseNow();
35 WidgetTest::TearDown(); 35 WidgetTest::TearDown();
36 } 36 }
37 37
38 protected: 38 protected:
39 Widget* widget_; 39 Widget* widget_;
40 std::unique_ptr<ui::test::EventGenerator> generator_; 40 std::unique_ptr<ui::test::EventGenerator> generator_;
41 ui::test::TestEventHandler handler_; 41 ui::test::TestEventHandler handler_;
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 75
76 generator_->ClickLeftButton(); 76 generator_->ClickLeftButton();
77 EXPECT_EQ(0, handler_.num_mouse_events()); 77 EXPECT_EQ(0, handler_.num_mouse_events());
78 78
79 monitor.reset(); 79 monitor.reset();
80 widget2->CloseNow(); 80 widget2->CloseNow();
81 } 81 }
82 82
83 } // namespace test 83 } // namespace test
84 } // namespace views 84 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698