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

Side by Side Diff: chrome/browser/renderer_host/render_widget_host_view_views.h

Issue 7778039: touchui: Fine-tune selection-controller visibility. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments Created 9 years, 3 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 CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_VIEWS_H_ 5 #ifndef CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_VIEWS_H_
6 #define CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_VIEWS_H_ 6 #define CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_VIEWS_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 void ShowCurrentCursor(); 198 void ShowCurrentCursor();
199 199
200 // Translate a views::MouseEvent into a WebKit::WebMouseEvent. 200 // Translate a views::MouseEvent into a WebKit::WebMouseEvent.
201 WebKit::WebMouseEvent WebMouseEventFromViewsEvent( 201 WebKit::WebMouseEvent WebMouseEventFromViewsEvent(
202 const views::MouseEvent& event); 202 const views::MouseEvent& event);
203 203
204 // Confirm existing composition text in the webpage and ask the input method 204 // Confirm existing composition text in the webpage and ask the input method
205 // to cancel its ongoing composition sesstion. 205 // to cancel its ongoing composition sesstion.
206 void FinishImeCompositionSession(); 206 void FinishImeCompositionSession();
207 207
208 // Updates the touch-selection controller (e.g. when the selection/focus
209 // changes).
210 void UpdateTouchSelectionController();
211
208 #if defined(TOOLKIT_USES_GTK) 212 #if defined(TOOLKIT_USES_GTK)
209 // On some systems, there can be two native views, where an outer native view 213 // On some systems, there can be two native views, where an outer native view
210 // contains the inner native view (e.g. when using GTK+). This returns the 214 // contains the inner native view (e.g. when using GTK+). This returns the
211 // inner view. This can return NULL when it's not attached to a view. 215 // inner view. This can return NULL when it's not attached to a view.
212 gfx::NativeView GetInnerNativeView() const; 216 gfx::NativeView GetInnerNativeView() const;
213 #endif 217 #endif
214 218
215 // The model object. 219 // The model object.
216 RenderWidgetHost* host_; 220 RenderWidgetHost* host_;
217 221
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 gfx::Rect caret_bounds_; 268 gfx::Rect caret_bounds_;
265 269
266 // Indicates if there is onging composition text. 270 // Indicates if there is onging composition text.
267 bool has_composition_text_; 271 bool has_composition_text_;
268 272
269 string16 tooltip_text_; 273 string16 tooltip_text_;
270 274
271 scoped_ptr<views::TouchSelectionController> touch_selection_controller_; 275 scoped_ptr<views::TouchSelectionController> touch_selection_controller_;
272 gfx::Point selection_start_; 276 gfx::Point selection_start_;
273 gfx::Point selection_end_; 277 gfx::Point selection_end_;
278 ScopedRunnableMethodFactory<RenderWidgetHostViewViews>
279 update_touch_selection_;
274 280
275 #if defined(TOUCH_UI) 281 #if defined(TOUCH_UI)
276 std::map<uint64, scoped_refptr<AcceleratedSurfaceContainerTouch> > 282 std::map<uint64, scoped_refptr<AcceleratedSurfaceContainerTouch> >
277 accelerated_surface_containers_; 283 accelerated_surface_containers_;
278 #endif 284 #endif
279 285
280 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewViews); 286 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewViews);
281 }; 287 };
282 288
283 #endif // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_VIEWS_H_ 289 #endif // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_VIEWS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698