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

Side by Side Diff: ash/host/ash_window_tree_host_x11.cc

Issue 2524873002: Rename WindowTreeHost G|SetBounds to indicate they are in pixels. (Closed)
Patch Set: rebase 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
« no previous file with comments | « ash/host/ash_window_tree_host_x11.h ('k') | ash/host/transformer_helper.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 "ash/host/ash_window_tree_host_x11.h" 5 #include "ash/host/ash_window_tree_host_x11.h"
6 6
7 #include <X11/extensions/Xfixes.h> 7 #include <X11/extensions/Xfixes.h>
8 #include <X11/extensions/XInput2.h> 8 #include <X11/extensions/XInput2.h>
9 #include <X11/Xatom.h> 9 #include <X11/Xatom.h>
10 #include <X11/Xlib.h> 10 #include <X11/Xlib.h>
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 window()->SetEventTargeter( 114 window()->SetEventTargeter(
115 std::unique_ptr<ui::EventTargeter>(new ui::NullEventTargeter)); 115 std::unique_ptr<ui::EventTargeter>(new ui::NullEventTargeter));
116 116
117 if (ui::PlatformEventSource::GetInstance()) { 117 if (ui::PlatformEventSource::GetInstance()) {
118 // Block X events which are not turned into ui::Events from getting 118 // Block X events which are not turned into ui::Events from getting
119 // processed. (e.g. ConfigureNotify) 119 // processed. (e.g. ConfigureNotify)
120 ui::PlatformEventSource::GetInstance()->RemovePlatformEventDispatcher(this); 120 ui::PlatformEventSource::GetInstance()->RemovePlatformEventDispatcher(this);
121 } 121 }
122 } 122 }
123 123
124 void AshWindowTreeHostX11::SetBounds(const gfx::Rect& bounds) { 124 void AshWindowTreeHostX11::SetBoundsInPixels(const gfx::Rect& bounds) {
125 WindowTreeHostX11::SetBounds(bounds); 125 WindowTreeHostX11::SetBoundsInPixels(bounds);
126 if (pointer_barriers_) { 126 if (pointer_barriers_) {
127 UnConfineCursor(); 127 UnConfineCursor();
128 ConfineCursorToRootWindow(); 128 ConfineCursorToRootWindow();
129 } 129 }
130 } 130 }
131 131
132 gfx::Transform AshWindowTreeHostX11::GetRootTransform() const { 132 gfx::Transform AshWindowTreeHostX11::GetRootTransform() const {
133 return transformer_helper_.GetTransform(); 133 return transformer_helper_.GetTransform();
134 } 134 }
135 135
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 continue; 250 continue;
251 XFree(data); 251 XFree(data);
252 XIChangeProperty(xdisplay(), dev_list[i].deviceid, prop, XA_INTEGER, 8, 252 XIChangeProperty(xdisplay(), dev_list[i].deviceid, prop, XA_INTEGER, 8,
253 PropModeReplace, &value, 1); 253 PropModeReplace, &value, 1);
254 } 254 }
255 } 255 }
256 } 256 }
257 #endif // defined(OS_CHROMEOS) 257 #endif // defined(OS_CHROMEOS)
258 258
259 } // namespace ash 259 } // namespace ash
OLDNEW
« no previous file with comments | « ash/host/ash_window_tree_host_x11.h ('k') | ash/host/transformer_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698