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

Unified Diff: ui/views/mus/platform_window_mus.cc

Issue 1982663003: [TEST ONLY] Run tests for 1981803003 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/mus/platform_window_mus.h ('k') | ui/views/mus/platform_window_mus_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/mus/platform_window_mus.cc
diff --git a/ui/views/mus/platform_window_mus.cc b/ui/views/mus/platform_window_mus.cc
index 99fa1709e15c27778b7590380753f89b4aeb8c8a..2df13b73dfdc737859856cff1afcff36d2800a64 100644
--- a/ui/views/mus/platform_window_mus.cc
+++ b/ui/views/mus/platform_window_mus.cc
@@ -71,7 +71,6 @@ PlatformWindowMus::PlatformWindowMus(ui::PlatformWindowDelegate* delegate,
mus_window_destroyed_(false) {
DCHECK(delegate_);
DCHECK(mus_window_);
- mus_window_->set_input_event_handler(this);
// We need accelerated widget numbers to be different for each
// window and fit in the smallest sizeof(AcceleratedWidget) uint32_t
@@ -93,11 +92,7 @@ PlatformWindowMus::PlatformWindowMus(ui::PlatformWindowDelegate* delegate,
bitmap_uploader_.get()));
}
-PlatformWindowMus::~PlatformWindowMus() {
- if (!mus_window_)
- return;
- mus_window_->set_input_event_handler(nullptr);
-}
+PlatformWindowMus::~PlatformWindowMus() {}
void PlatformWindowMus::Show() {}
@@ -151,19 +146,4 @@ ui::PlatformImeController* PlatformWindowMus::GetPlatformImeController() {
return nullptr;
}
-void PlatformWindowMus::OnWindowInputEvent(
- mus::Window* view,
- const ui::Event& event_in,
- std::unique_ptr<base::Callback<void(EventResult)>>* ack_callback) {
- // Take ownership of the callback, indicating that we will handle it.
- EventAckHandler ack_handler(std::move(*ack_callback));
-
- std::unique_ptr<ui::Event> event = ui::Event::Clone(event_in);
- delegate_->DispatchEvent(event.get());
- // NOTE: |this| may be deleted.
-
- ack_handler.set_handled(event->handled());
- // |ack_handler| acks the event on destruction if necessary.
-}
-
} // namespace views
« no previous file with comments | « ui/views/mus/platform_window_mus.h ('k') | ui/views/mus/platform_window_mus_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698