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

Side by Side Diff: ui/views/mus/window_tree_host_mus.cc

Issue 1908913002: Revert of mus: Fix event transformation in client code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
OLDNEW
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/mus/window_tree_host_mus.h" 5 #include "ui/views/mus/window_tree_host_mus.h"
6 6
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "ui/aura/window.h" 8 #include "ui/aura/window.h"
9 #include "ui/aura/window_event_dispatcher.h" 9 #include "ui/aura/window_event_dispatcher.h"
10 #include "ui/events/event.h" 10 #include "ui/events/event.h"
11 #include "ui/views/mus/input_method_mus.h" 11 #include "ui/views/mus/input_method_mus.h"
12 #include "ui/views/mus/native_widget_mus.h" 12 #include "ui/views/mus/native_widget_mus.h"
13 #include "ui/views/mus/platform_window_mus.h" 13 #include "ui/views/mus/platform_window_mus.h"
14 14
15 namespace views { 15 namespace views {
16 16
17 //////////////////////////////////////////////////////////////////////////////// 17 ////////////////////////////////////////////////////////////////////////////////
18 // WindowTreeHostMus, public: 18 // WindowTreeHostMus, public:
19 19
20 WindowTreeHostMus::WindowTreeHostMus(shell::Connector* connector, 20 WindowTreeHostMus::WindowTreeHostMus(shell::Connector* connector,
21 NativeWidgetMus* native_widget, 21 NativeWidgetMus* native_widget,
22 mus::Window* window) 22 mus::Window* window)
23 : native_widget_(native_widget), 23 : native_widget_(native_widget),
24 show_state_(ui::PLATFORM_WINDOW_STATE_UNKNOWN) { 24 show_state_(ui::PLATFORM_WINDOW_STATE_UNKNOWN) {
25 SetPlatformWindow( 25 SetPlatformWindow(
26 base::WrapUnique(new PlatformWindowMus(this, connector, window))); 26 base::WrapUnique(new PlatformWindowMus(this, connector, window)));
27 // The location of events is already transformed, and there is no way to
28 // correctly determine the reverse transform. So, don't attempt to transform
29 // event locations, else the root location is wrong.
30 // TODO(sky): we need to transform for device scale though.
31 dispatcher()->set_transform_events(false);
27 compositor()->SetHostHasTransparentBackground(true); 32 compositor()->SetHostHasTransparentBackground(true);
28 33
29 input_method_.reset(new InputMethodMUS(this, window)); 34 input_method_.reset(new InputMethodMUS(this, window));
30 SetSharedInputMethod(input_method_.get()); 35 SetSharedInputMethod(input_method_.get());
31 } 36 }
32 37
33 WindowTreeHostMus::~WindowTreeHostMus() { 38 WindowTreeHostMus::~WindowTreeHostMus() {
34 DestroyCompositor(); 39 DestroyCompositor();
35 DestroyDispatcher(); 40 DestroyDispatcher();
36 } 41 }
(...skipping 29 matching lines...) Expand all
66 if (native_widget_) 71 if (native_widget_)
67 native_widget_->OnActivationChanged(active); 72 native_widget_->OnActivationChanged(active);
68 WindowTreeHostPlatform::OnActivationChanged(active); 73 WindowTreeHostPlatform::OnActivationChanged(active);
69 } 74 }
70 75
71 void WindowTreeHostMus::OnCloseRequest() { 76 void WindowTreeHostMus::OnCloseRequest() {
72 OnHostCloseRequested(); 77 OnHostCloseRequested();
73 } 78 }
74 79
75 } // namespace views 80 } // namespace views
OLDNEW
« no previous file with comments | « ui/events/event_unittest.cc ('k') | ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698