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 <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
224 const base::string16& text, | 224 const base::string16& text, |
225 const std::vector<blink::WebCompositionUnderline>& underlines, | 225 const std::vector<blink::WebCompositionUnderline>& underlines, |
226 int selection_start, | 226 int selection_start, |
227 int selection_end); | 227 int selection_end); |
228 void SimulateImeConfirmComposition(const base::string16& text, | 228 void SimulateImeConfirmComposition(const base::string16& text, |
229 const gfx::Range& replacement_range); | 229 const gfx::Range& replacement_range); |
230 | 230 |
231 // TODO(jam): remove these once the IPC handler moves from RenderView to | 231 // TODO(jam): remove these once the IPC handler moves from RenderView to |
232 // RenderFrame. | 232 // RenderFrame. |
233 void OnImeSetComposition( | 233 void OnImeSetComposition( |
234 const base::string16& text, | 234 const base::string16& text, |
235 const std::vector<blink::WebCompositionUnderline>& underlines, | 235 const std::vector<blink::WebCompositionUnderline>& underlines, |
236 int selection_start, | 236 int selection_start, |
237 int selection_end); | 237 int selection_end); |
238 void OnImeConfirmComposition( | 238 void OnImeConfirmComposition(const base::string16& text, |
239 const base::string16& text, | 239 const gfx::Range& replacement_range, |
240 const gfx::Range& replacement_range, | 240 bool keep_selection); |
241 bool keep_selection); | 241 #endif // defined(ENABLE_PLUGINS) |
242 #endif // ENABLE_PLUGINS | |
243 | 242 |
244 // May return NULL in some cases, especially if userMediaClient() returns | 243 // May return NULL in some cases, especially if userMediaClient() returns |
245 // NULL. | 244 // NULL. |
246 MediaStreamDispatcher* GetMediaStreamDispatcher(); | 245 MediaStreamDispatcher* GetMediaStreamDispatcher(); |
247 | 246 |
248 #if defined(OS_MACOSX) || defined(OS_ANDROID) | 247 #if defined(OS_MACOSX) || defined(OS_ANDROID) |
249 void DidHideExternalPopupMenu(); | 248 void DidHideExternalPopupMenu(); |
250 #endif | 249 #endif |
251 | 250 |
252 // IPC::Sender | 251 // IPC::Sender |
(...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
784 #endif | 783 #endif |
785 | 784 |
786 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; | 785 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; |
787 | 786 |
788 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); | 787 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); |
789 }; | 788 }; |
790 | 789 |
791 } // namespace content | 790 } // namespace content |
792 | 791 |
793 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ | 792 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ |
OLD | NEW |