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

Side by Side Diff: ui/aura/root_window_host_linux.cc

Issue 10831240: Remove TouchEvent interface, and rename TouchEventImpl to TouchEvent (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge-tot 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/aura/root_window_host_delegate.h ('k') | ui/aura/root_window_unittest.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 (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 "ui/aura/root_window_host_linux.h" 5 #include "ui/aura/root_window_host_linux.h"
6 6
7 #include <X11/Xatom.h> 7 #include <X11/Xatom.h>
8 #include <X11/Xcursor/Xcursor.h> 8 #include <X11/Xcursor/Xcursor.h>
9 #include <X11/Xlib.h> 9 #include <X11/Xlib.h>
10 #include <X11/cursorfont.h> 10 #include <X11/cursorfont.h>
(...skipping 627 matching lines...) Expand 10 before | Expand all | Expand 10 after
638 break; 638 break;
639 639
640 ui::EventType type = ui::EventTypeFromNative(xev); 640 ui::EventType type = ui::EventTypeFromNative(xev);
641 XEvent last_event; 641 XEvent last_event;
642 int num_coalesced = 0; 642 int num_coalesced = 0;
643 643
644 switch (type) { 644 switch (type) {
645 case ui::ET_TOUCH_PRESSED: 645 case ui::ET_TOUCH_PRESSED:
646 case ui::ET_TOUCH_RELEASED: 646 case ui::ET_TOUCH_RELEASED:
647 case ui::ET_TOUCH_MOVED: { 647 case ui::ET_TOUCH_MOVED: {
648 ui::TouchEventImpl touchev(xev); 648 ui::TouchEvent touchev(xev);
649 delegate_->OnHostTouchEvent(&touchev); 649 delegate_->OnHostTouchEvent(&touchev);
650 break; 650 break;
651 } 651 }
652 case ui::ET_MOUSE_MOVED: 652 case ui::ET_MOUSE_MOVED:
653 case ui::ET_MOUSE_DRAGGED: 653 case ui::ET_MOUSE_DRAGGED:
654 case ui::ET_MOUSE_PRESSED: 654 case ui::ET_MOUSE_PRESSED:
655 case ui::ET_MOUSE_RELEASED: 655 case ui::ET_MOUSE_RELEASED:
656 case ui::ET_MOUSEWHEEL: 656 case ui::ET_MOUSEWHEEL:
657 case ui::ET_MOUSE_ENTERED: 657 case ui::ET_MOUSE_ENTERED:
658 case ui::ET_MOUSE_EXITED: { 658 case ui::ET_MOUSE_EXITED: {
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after
1054 ui::ViewProp::GetValue(accelerated_widget, kRootWindowHostLinuxKey)); 1054 ui::ViewProp::GetValue(accelerated_widget, kRootWindowHostLinuxKey));
1055 } 1055 }
1056 1056
1057 // static 1057 // static
1058 gfx::Size RootWindowHost::GetNativeScreenSize() { 1058 gfx::Size RootWindowHost::GetNativeScreenSize() {
1059 ::Display* xdisplay = base::MessagePumpAuraX11::GetDefaultXDisplay(); 1059 ::Display* xdisplay = base::MessagePumpAuraX11::GetDefaultXDisplay();
1060 return gfx::Size(DisplayWidth(xdisplay, 0), DisplayHeight(xdisplay, 0)); 1060 return gfx::Size(DisplayWidth(xdisplay, 0), DisplayHeight(xdisplay, 0));
1061 } 1061 }
1062 1062
1063 } // namespace aura 1063 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/root_window_host_delegate.h ('k') | ui/aura/root_window_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698