| 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 | 350 |
| 351 // TODO(jam): remove these once the IPC handler moves from RenderView to | 351 // TODO(jam): remove these once the IPC handler moves from RenderView to |
| 352 // RenderFrame. | 352 // RenderFrame. |
| 353 void OnImeSetComposition( | 353 void OnImeSetComposition( |
| 354 const base::string16& text, | 354 const base::string16& text, |
| 355 const std::vector<blink::WebCompositionUnderline>& underlines, | 355 const std::vector<blink::WebCompositionUnderline>& underlines, |
| 356 int selection_start, | 356 int selection_start, |
| 357 int selection_end); | 357 int selection_end); |
| 358 void OnImeConfirmComposition(const base::string16& text, | 358 void OnImeConfirmComposition(const base::string16& text, |
| 359 const gfx::Range& replacement_range, | 359 const gfx::Range& replacement_range, |
| 360 bool keep_selection); | 360 bool keep_selection, |
| 361 int newCursorPosition = 1); |
| 361 #endif // defined(ENABLE_PLUGINS) | 362 #endif // defined(ENABLE_PLUGINS) |
| 362 | 363 |
| 363 // May return NULL in some cases, especially if userMediaClient() returns | 364 // May return NULL in some cases, especially if userMediaClient() returns |
| 364 // NULL. | 365 // NULL. |
| 365 MediaStreamDispatcher* GetMediaStreamDispatcher(); | 366 MediaStreamDispatcher* GetMediaStreamDispatcher(); |
| 366 | 367 |
| 367 #if defined(OS_MACOSX) || defined(OS_ANDROID) | 368 #if defined(OS_MACOSX) || defined(OS_ANDROID) |
| 368 void DidHideExternalPopupMenu(); | 369 void DidHideExternalPopupMenu(); |
| 369 #endif | 370 #endif |
| 370 | 371 |
| (...skipping 872 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1243 #endif | 1244 #endif |
| 1244 | 1245 |
| 1245 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; | 1246 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; |
| 1246 | 1247 |
| 1247 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); | 1248 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); |
| 1248 }; | 1249 }; |
| 1249 | 1250 |
| 1250 } // namespace content | 1251 } // namespace content |
| 1251 | 1252 |
| 1252 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ | 1253 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ |
| OLD | NEW |