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

Side by Side Diff: views/widget/root_view.h

Issue 6823055: Consolidate OnKeyEvent and InputMethod code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Resore most InputMethod code. Created 9 years, 8 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #ifndef VIEWS_WIDGET_ROOT_VIEW_H_ 5 #ifndef VIEWS_WIDGET_ROOT_VIEW_H_
6 #define VIEWS_WIDGET_ROOT_VIEW_H_ 6 #define VIEWS_WIDGET_ROOT_VIEW_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 void SetContentsView(View* contents_view); 54 void SetContentsView(View* contents_view);
55 55
56 // Called when parent of the host changed. 56 // Called when parent of the host changed.
57 void NotifyNativeViewHierarchyChanged(bool attached, 57 void NotifyNativeViewHierarchyChanged(bool attached,
58 gfx::NativeView native_view); 58 gfx::NativeView native_view);
59 59
60 // Input --------------------------------------------------------------------- 60 // Input ---------------------------------------------------------------------
61 61
62 // Process a key event. Send the event to the focused view and up the focus 62 // Process a key event. Send the event to the focused view and up the focus
63 // path, and finally to the default keyboard handler, until someone consumes 63 // path, and finally to the default keyboard handler, until someone consumes
64 // it. Returns whether anyone consumed the event. 64 // it. Returns whether anyone consumed the event.
65 bool ProcessKeyEvent(const KeyEvent& event); 65 bool OnKeyEvent(const KeyEvent& event);
66 66
67 #if defined(TOUCH_UI) && defined(UNIT_TEST) 67 #if defined(TOUCH_UI) && defined(UNIT_TEST)
68 // For unit testing purposes, we use this method to set a mock 68 // For unit testing purposes, we use this method to set a mock
69 // GestureManager 69 // GestureManager
70 void SetGestureManager(GestureManager* g) { gesture_manager_ = g; } 70 void SetGestureManager(GestureManager* g) { gesture_manager_ = g; }
71 #endif 71 #endif
72 72
73 // Focus --------------------------------------------------------------------- 73 // Focus ---------------------------------------------------------------------
74 74
75 // Used to set the FocusTraversable parent after the view has been created 75 // Used to set the FocusTraversable parent after the view has been created
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 // Drag and drop ------------------------------------------------------------- 209 // Drag and drop -------------------------------------------------------------
210 210
211 // Tracks drag state for a view. 211 // Tracks drag state for a view.
212 View::DragInfo drag_info; 212 View::DragInfo drag_info;
213 213
214 DISALLOW_IMPLICIT_CONSTRUCTORS(RootView); 214 DISALLOW_IMPLICIT_CONSTRUCTORS(RootView);
215 }; 215 };
216 } // namespace views 216 } // namespace views
217 217
218 #endif // VIEWS_WIDGET_ROOT_VIEW_H_ 218 #endif // VIEWS_WIDGET_ROOT_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698