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

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: 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 void UpdateTouchSelectionController();
rjkroege 2011/09/02 19:15:25 how about a doc string?
sadrul 2011/09/02 19:39:44 Done.
209
208 #if defined(TOOLKIT_USES_GTK) 210 #if defined(TOOLKIT_USES_GTK)
209 // On some systems, there can be two native views, where an outer native view 211 // 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 212 // 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. 213 // inner view. This can return NULL when it's not attached to a view.
212 gfx::NativeView GetInnerNativeView() const; 214 gfx::NativeView GetInnerNativeView() const;
213 #endif 215 #endif
214 216
215 // The model object. 217 // The model object.
216 RenderWidgetHost* host_; 218 RenderWidgetHost* host_;
217 219
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 gfx::Rect caret_bounds_; 266 gfx::Rect caret_bounds_;
265 267
266 // Indicates if there is onging composition text. 268 // Indicates if there is onging composition text.
267 bool has_composition_text_; 269 bool has_composition_text_;
268 270
269 string16 tooltip_text_; 271 string16 tooltip_text_;
270 272
271 scoped_ptr<views::TouchSelectionController> touch_selection_controller_; 273 scoped_ptr<views::TouchSelectionController> touch_selection_controller_;
272 gfx::Point selection_start_; 274 gfx::Point selection_start_;
273 gfx::Point selection_end_; 275 gfx::Point selection_end_;
276 ScopedRunnableMethodFactory<RenderWidgetHostViewViews>
277 update_touch_selection_;
274 278
275 #if defined(TOUCH_UI) 279 #if defined(TOUCH_UI)
276 std::map<uint64, scoped_refptr<AcceleratedSurfaceContainerTouch> > 280 std::map<uint64, scoped_refptr<AcceleratedSurfaceContainerTouch> >
277 accelerated_surface_containers_; 281 accelerated_surface_containers_;
278 #endif 282 #endif
279 283
280 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewViews); 284 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewViews);
281 }; 285 };
282 286
283 #endif // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_VIEWS_H_ 287 #endif // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_VIEWS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698