Chromium Code Reviews| 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 348 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 359 | 359 |
| 360 // TODO(jam): remove these once the IPC handler moves from RenderView to | 360 // TODO(jam): remove these once the IPC handler moves from RenderView to |
| 361 // RenderFrame. | 361 // RenderFrame. |
| 362 void OnImeSetComposition( | 362 void OnImeSetComposition( |
| 363 const base::string16& text, | 363 const base::string16& text, |
| 364 const std::vector<blink::WebCompositionUnderline>& underlines, | 364 const std::vector<blink::WebCompositionUnderline>& underlines, |
| 365 int selection_start, | 365 int selection_start, |
| 366 int selection_end); | 366 int selection_end); |
| 367 void OnImeConfirmComposition(const base::string16& text, | 367 void OnImeConfirmComposition(const base::string16& text, |
| 368 const gfx::Range& replacement_range, | 368 const gfx::Range& replacement_range, |
| 369 bool keep_selection); | 369 bool keep_selection, |
| 370 int newCursorPosition = 1); | |
|
Changwan Ryu
2016/08/03 07:37:30
new_cursor_position
yabinh
2016/08/08 07:33:43
Done.
| |
| 370 #endif // defined(ENABLE_PLUGINS) | 371 #endif // defined(ENABLE_PLUGINS) |
| 371 | 372 |
| 372 // May return NULL in some cases, especially if userMediaClient() returns | 373 // May return NULL in some cases, especially if userMediaClient() returns |
| 373 // NULL. | 374 // NULL. |
| 374 MediaStreamDispatcher* GetMediaStreamDispatcher(); | 375 MediaStreamDispatcher* GetMediaStreamDispatcher(); |
| 375 | 376 |
| 376 #if defined(USE_EXTERNAL_POPUP_MENU) | 377 #if defined(USE_EXTERNAL_POPUP_MENU) |
| 377 void DidHideExternalPopupMenu(); | 378 void DidHideExternalPopupMenu(); |
| 378 #endif | 379 #endif |
| 379 | 380 |
| (...skipping 898 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1278 mojom::FrameHostPtr frame_host_; | 1279 mojom::FrameHostPtr frame_host_; |
| 1279 | 1280 |
| 1280 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; | 1281 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; |
| 1281 | 1282 |
| 1282 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); | 1283 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); |
| 1283 }; | 1284 }; |
| 1284 | 1285 |
| 1285 } // namespace content | 1286 } // namespace content |
| 1286 | 1287 |
| 1287 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ | 1288 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ |
| OLD | NEW |