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 351 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
362 | 362 |
363 // TODO(jam): remove these once the IPC handler moves from RenderView to | 363 // TODO(jam): remove these once the IPC handler moves from RenderView to |
364 // RenderFrame. | 364 // RenderFrame. |
365 void OnImeSetComposition( | 365 void OnImeSetComposition( |
366 const base::string16& text, | 366 const base::string16& text, |
367 const std::vector<blink::WebCompositionUnderline>& underlines, | 367 const std::vector<blink::WebCompositionUnderline>& underlines, |
368 int selection_start, | 368 int selection_start, |
369 int selection_end); | 369 int selection_end); |
370 void OnImeConfirmComposition(const base::string16& text, | 370 void OnImeConfirmComposition(const base::string16& text, |
371 const gfx::Range& replacement_range, | 371 const gfx::Range& replacement_range, |
372 bool keep_selection); | 372 bool keep_selection, |
| 373 int new_cursor_pos = 1); |
373 #endif // defined(ENABLE_PLUGINS) | 374 #endif // defined(ENABLE_PLUGINS) |
374 | 375 |
375 // May return NULL in some cases, especially if userMediaClient() returns | 376 // May return NULL in some cases, especially if userMediaClient() returns |
376 // NULL. | 377 // NULL. |
377 MediaStreamDispatcher* GetMediaStreamDispatcher(); | 378 MediaStreamDispatcher* GetMediaStreamDispatcher(); |
378 | 379 |
379 #if defined(USE_EXTERNAL_POPUP_MENU) | 380 #if defined(USE_EXTERNAL_POPUP_MENU) |
380 void DidHideExternalPopupMenu(); | 381 void DidHideExternalPopupMenu(); |
381 #endif | 382 #endif |
382 | 383 |
(...skipping 901 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1284 mojom::FrameHostPtr frame_host_; | 1285 mojom::FrameHostPtr frame_host_; |
1285 | 1286 |
1286 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; | 1287 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; |
1287 | 1288 |
1288 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); | 1289 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); |
1289 }; | 1290 }; |
1290 | 1291 |
1291 } // namespace content | 1292 } // namespace content |
1292 | 1293 |
1293 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ | 1294 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ |
OLD | NEW |