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 339 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
350 // Notification that the given plugin has crashed. | 350 // Notification that the given plugin has crashed. |
351 void PluginCrashed(const base::FilePath& plugin_path, | 351 void PluginCrashed(const base::FilePath& plugin_path, |
352 base::ProcessId plugin_pid); | 352 base::ProcessId plugin_pid); |
353 | 353 |
354 // Simulates IME events for testing purpose. | 354 // Simulates IME events for testing purpose. |
355 void SimulateImeSetComposition( | 355 void SimulateImeSetComposition( |
356 const base::string16& text, | 356 const base::string16& text, |
357 const std::vector<blink::WebCompositionUnderline>& underlines, | 357 const std::vector<blink::WebCompositionUnderline>& underlines, |
358 int selection_start, | 358 int selection_start, |
359 int selection_end); | 359 int selection_end); |
360 void SimulateImeConfirmComposition(const base::string16& text, | 360 void SimulateImeCommitText(const base::string16& text, |
361 const gfx::Range& replacement_range); | 361 const gfx::Range& replacement_range); |
| 362 void SimulateImeFinishComposingText(bool keep_selection); |
362 | 363 |
363 // TODO(jam): remove these once the IPC handler moves from RenderView to | 364 // TODO(jam): remove these once the IPC handler moves from RenderView to |
364 // RenderFrame. | 365 // RenderFrame. |
365 void OnImeSetComposition( | 366 void OnImeSetComposition( |
366 const base::string16& text, | 367 const base::string16& text, |
367 const std::vector<blink::WebCompositionUnderline>& underlines, | 368 const std::vector<blink::WebCompositionUnderline>& underlines, |
368 int selection_start, | 369 int selection_start, |
369 int selection_end); | 370 int selection_end); |
370 void OnImeConfirmComposition(const base::string16& text, | 371 void OnImeCommitText(const base::string16& text, |
371 const gfx::Range& replacement_range, | 372 const gfx::Range& replacement_range, |
372 bool keep_selection); | 373 int relative_cursor_pos); |
| 374 void OnImeFinishComposingText(bool keep_selection); |
| 375 |
373 #endif // defined(ENABLE_PLUGINS) | 376 #endif // defined(ENABLE_PLUGINS) |
374 | 377 |
375 // May return NULL in some cases, especially if userMediaClient() returns | 378 // May return NULL in some cases, especially if userMediaClient() returns |
376 // NULL. | 379 // NULL. |
377 MediaStreamDispatcher* GetMediaStreamDispatcher(); | 380 MediaStreamDispatcher* GetMediaStreamDispatcher(); |
378 | 381 |
379 #if defined(USE_EXTERNAL_POPUP_MENU) | 382 #if defined(USE_EXTERNAL_POPUP_MENU) |
380 void DidHideExternalPopupMenu(); | 383 void DidHideExternalPopupMenu(); |
381 #endif | 384 #endif |
382 | 385 |
(...skipping 894 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1277 bool has_accessed_initial_document_; | 1280 bool has_accessed_initial_document_; |
1278 | 1281 |
1279 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; | 1282 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; |
1280 | 1283 |
1281 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); | 1284 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); |
1282 }; | 1285 }; |
1283 | 1286 |
1284 } // namespace content | 1287 } // namespace content |
1285 | 1288 |
1286 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ | 1289 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ |
OLD | NEW |