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

Unified Diff: ui/views/widget/desktop_native_widget_helper_aura.cc

Issue 10827145: Convert Aura to use ui::Event. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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/view_unittest.cc ('k') | ui/views/widget/native_widget_aura.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/desktop_native_widget_helper_aura.cc
===================================================================
--- ui/views/widget/desktop_native_widget_helper_aura.cc (revision 150582)
+++ ui/views/widget/desktop_native_widget_helper_aura.cc (working copy)
@@ -46,7 +46,7 @@
virtual void ConvertPointToScreen(const aura::Window* window,
gfx::Point* point) OVERRIDE {
const aura::RootWindow* root_window = window->GetRootWindow();
- aura::Window::ConvertPointToWindow(window, root_window, point);
+ aura::Window::ConvertPointToTarget(window, root_window, point);
gfx::Point origin = root_window->GetHostOrigin();
point->Offset(origin.x(), origin.y());
}
@@ -56,14 +56,14 @@
const aura::RootWindow* root_window = window->GetRootWindow();
gfx::Point origin = root_window->GetHostOrigin();
point->Offset(-origin.x(), -origin.y());
- aura::Window::ConvertPointToWindow(root_window, window, point);
+ aura::Window::ConvertPointToTarget(root_window, window, point);
}
virtual void SetBounds(aura::Window* window,
const gfx::Rect& bounds) OVERRIDE {
gfx::Point origin = bounds.origin();
aura::RootWindow* root = window->GetRootWindow();
- aura::Window::ConvertPointToWindow(window->parent(), root, &origin);
+ aura::Window::ConvertPointToTarget(window->parent(), root, &origin);
#if !defined(OS_WIN)
if (window->type() == aura::client::WINDOW_TYPE_CONTROL) {
« no previous file with comments | « ui/views/view_unittest.cc ('k') | ui/views/widget/native_widget_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698