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

Side by Side Diff: ui/events/event_utils.cc

Issue 1155013005: Refactoring the ownership of ui::InputMethod. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed bot failure: cast_shell_linux Created 5 years, 6 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 (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/events/event_utils.h" 5 #include "ui/events/event_utils.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ui/events/event.h" 9 #include "ui/events/event.h"
10 #include "ui/gfx/display.h" 10 #include "ui/gfx/display.h"
11 #include "ui/gfx/screen.h" 11 #include "ui/gfx/screen.h"
12 12
13 namespace ui { 13 namespace ui {
14 14
15 namespace { 15 namespace {
16 int g_custom_event_types = ET_LAST; 16 int g_custom_event_types = ET_LAST;
17 } // namespace 17 } // namespace
18 18
19 scoped_ptr<Event> EventFromNative(const base::NativeEvent& native_event) { 19 scoped_ptr<Event> EventFromNative(const base::NativeEvent& native_event) {
20 scoped_ptr<Event> event; 20 scoped_ptr<Event> event;
21 EventType type = EventTypeFromNative(native_event); 21 EventType type = EventTypeFromNative(native_event);
22 switch(type) { 22 switch(type) {
23 case ET_KEY_PRESSED: 23 case ET_KEY_PRESSED:
24 case ET_KEY_RELEASED: 24 case ET_KEY_RELEASED:
25 event.reset(new KeyEvent(native_event)); 25 event.reset(new KeyEvent(native_event));
26 break; 26 break;
27 27
28 case ET_TRANSLATED_KEY_PRESS:
29 case ET_TRANSLATED_KEY_RELEASE:
30 // These should not be generated by native events.
31 NOTREACHED();
32 break;
33
34 case ET_MOUSE_PRESSED: 28 case ET_MOUSE_PRESSED:
35 case ET_MOUSE_DRAGGED: 29 case ET_MOUSE_DRAGGED:
36 case ET_MOUSE_RELEASED: 30 case ET_MOUSE_RELEASED:
37 case ET_MOUSE_MOVED: 31 case ET_MOUSE_MOVED:
38 case ET_MOUSE_ENTERED: 32 case ET_MOUSE_ENTERED:
39 case ET_MOUSE_EXITED: 33 case ET_MOUSE_EXITED:
40 event.reset(new MouseEvent(native_event)); 34 event.reset(new MouseEvent(native_event));
41 break; 35 break;
42 36
43 case ET_MOUSEWHEEL: 37 case ET_MOUSEWHEEL:
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 const std::vector<gfx::Display>& displays = screen->GetAllDisplays(); 79 const std::vector<gfx::Display>& displays = screen->GetAllDisplays();
86 for (std::vector<gfx::Display>::const_iterator it = displays.begin(); 80 for (std::vector<gfx::Display>::const_iterator it = displays.begin();
87 it != displays.end(); ++it) { 81 it != displays.end(); ++it) {
88 if (it->IsInternal()) 82 if (it->IsInternal())
89 return it->touch_support(); 83 return it->touch_support();
90 } 84 }
91 return gfx::Display::TOUCH_SUPPORT_UNAVAILABLE; 85 return gfx::Display::TOUCH_SUPPORT_UNAVAILABLE;
92 } 86 }
93 87
94 } // namespace ui 88 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698