OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ | 5 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ |
6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ | 6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ |
7 | 7 |
8 #include <stddef.h> | 8 #include <stddef.h> |
9 #include <stdint.h> | 9 #include <stdint.h> |
10 | 10 |
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
361 | 361 |
362 // TODO(jam): remove these once the IPC handler moves from RenderView to | 362 // TODO(jam): remove these once the IPC handler moves from RenderView to |
363 // RenderFrame. | 363 // RenderFrame. |
364 void OnImeSetComposition( | 364 void OnImeSetComposition( |
365 const base::string16& text, | 365 const base::string16& text, |
366 const std::vector<blink::WebCompositionUnderline>& underlines, | 366 const std::vector<blink::WebCompositionUnderline>& underlines, |
367 int selection_start, | 367 int selection_start, |
368 int selection_end); | 368 int selection_end); |
369 void OnImeConfirmComposition(const base::string16& text, | 369 void OnImeConfirmComposition(const base::string16& text, |
370 const gfx::Range& replacement_range, | 370 const gfx::Range& replacement_range, |
371 bool keep_selection); | 371 bool keep_selection, |
| 372 int relative_cursor_pos); |
372 #endif // defined(ENABLE_PLUGINS) | 373 #endif // defined(ENABLE_PLUGINS) |
373 | 374 |
374 // May return NULL in some cases, especially if userMediaClient() returns | 375 // May return NULL in some cases, especially if userMediaClient() returns |
375 // NULL. | 376 // NULL. |
376 MediaStreamDispatcher* GetMediaStreamDispatcher(); | 377 MediaStreamDispatcher* GetMediaStreamDispatcher(); |
377 | 378 |
378 #if defined(USE_EXTERNAL_POPUP_MENU) | 379 #if defined(USE_EXTERNAL_POPUP_MENU) |
379 void DidHideExternalPopupMenu(); | 380 void DidHideExternalPopupMenu(); |
380 #endif | 381 #endif |
381 | 382 |
(...skipping 892 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1274 mojom::FrameHostPtr frame_host_; | 1275 mojom::FrameHostPtr frame_host_; |
1275 | 1276 |
1276 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; | 1277 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; |
1277 | 1278 |
1278 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); | 1279 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); |
1279 }; | 1280 }; |
1280 | 1281 |
1281 } // namespace content | 1282 } // namespace content |
1282 | 1283 |
1283 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ | 1284 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ |
OLD | NEW |