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

Side by Side Diff: ash/drag_drop/drag_drop_tracker.cc

Issue 101573006: Changes MouseEvent constructor to take changed_button_flags. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test; needs updated expectations as mouse entered wasnt sent before because of env::mouse_butto… Created 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/drag_drop/drag_drop_tracker.h" 5 #include "ash/drag_drop/drag_drop_tracker.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_window_ids.h" 8 #include "ash/shell_window_ids.h"
9 #include "ash/wm/coordinate_conversion.h" 9 #include "ash/wm/coordinate_conversion.h"
10 #include "ui/aura/client/window_tree_client.h" 10 #include "ui/aura/client/window_tree_client.h"
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 gfx::Point location_in_screen = event.location(); 67 gfx::Point location_in_screen = event.location();
68 ash::wm::ConvertPointToScreen(capture_window_.get(), &location_in_screen); 68 ash::wm::ConvertPointToScreen(capture_window_.get(), &location_in_screen);
69 gfx::Point target_root_location = event.root_location(); 69 gfx::Point target_root_location = event.root_location();
70 aura::Window::ConvertPointToTarget( 70 aura::Window::ConvertPointToTarget(
71 capture_window_->GetRootWindow(), 71 capture_window_->GetRootWindow(),
72 ash::wm::GetRootWindowAt(location_in_screen), 72 ash::wm::GetRootWindowAt(location_in_screen),
73 &target_root_location); 73 &target_root_location);
74 return new ui::MouseEvent(event.type(), 74 return new ui::MouseEvent(event.type(),
75 target_location, 75 target_location,
76 target_root_location, 76 target_root_location,
77 event.flags()); 77 event.flags(),
78 static_cast<const ui::MouseEvent&>(event).
79 changed_button_flags());
78 } 80 }
79 81
80 } // namespace internal 82 } // namespace internal
81 } // namespace ash 83 } // namespace ash
OLDNEW
« no previous file with comments | « ash/drag_drop/drag_drop_controller_unittest.cc ('k') | ash/drag_drop/drag_drop_tracker_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698