Chromium Code Reviews| Index: content/browser/renderer_host/render_widget_host_view_mac.h |
| diff --git a/content/browser/renderer_host/render_widget_host_view_mac.h b/content/browser/renderer_host/render_widget_host_view_mac.h |
| index 408eb9d0f7e38da556b1290e622085d507de919b..b374f9f66ad69dfc66721b34cfe101070e0c60c6 100644 |
| --- a/content/browser/renderer_host/render_widget_host_view_mac.h |
| +++ b/content/browser/renderer_host/render_widget_host_view_mac.h |
| @@ -267,10 +267,7 @@ class CONTENT_EXPORT RenderWidgetHostViewMac |
| void SetShowingContextMenu(bool showing) override; |
| void SetActive(bool active) override; |
| void ShowDefinitionForSelection() override; |
| - bool SupportsSpeech() const override; |
| void SpeakSelection() override; |
| - bool IsSpeaking() const override; |
| - void StopSpeaking() override; |
| void SetBackgroundColor(SkColor color) override; |
| void SetNeedsBeginFrames(bool needs_begin_frames) override; |
| @@ -374,7 +371,7 @@ class CONTENT_EXPORT RenderWidgetHostViewMac |
| void SetTextInputActive(bool active); |
| - const std::string& selected_text() const { return selected_text_; } |
| + const base::string16& selected_text() const { return selected_text_; } |
| const gfx::Range& composition_range() const { return composition_range_; } |
| const base::string16& selection_text() const { return selection_text_; } |
| size_t selection_text_offset() const { return selection_text_offset_; } |
| @@ -485,14 +482,12 @@ class CONTENT_EXPORT RenderWidgetHostViewMac |
| void ShutdownHost(); |
| // IPC message handlers. |
| + // TODO(spqchan): Change |text| to be the type string16. |
|
Alexei Svitkine (slow)
2017/02/01 19:12:37
Can you provide more context here? Why is string16
spqchan
2017/02/02 20:35:05
This is done to avoid some conversions, since sele
Alexei Svitkine (slow)
2017/02/02 20:50:24
If you keep it here, expand the comment to refer t
spqchan
2017/02/03 23:32:10
Done.
|
| void OnGetRenderedTextCompleted(const std::string& text); |
| // Send updated vsync parameters to the top level display. |
| void UpdateDisplayVSyncParameters(); |
| - // Dispatches a TTS session. |
| - void SpeakText(const std::string& text); |
| - |
| // Get the focused view that should be used for retrieving the text selection. |
| RenderWidgetHostViewBase* GetFocusedViewForTextSelection(); |
| @@ -521,7 +516,7 @@ class CONTENT_EXPORT RenderWidgetHostViewMac |
| bool is_guest_view_hack_; |
| // selected text on the renderer. |
| - std::string selected_text_; |
| + base::string16 selected_text_; |
| // The window used for popup widgets. |
| base::scoped_nsobject<NSWindow> popup_window_; |