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 4a667b0ab232b10a17f14435fff565e0fd5cbe80..ffacd53a7779cacd95e3bdeb54362a898a2340e0 100644 |
--- a/content/browser/renderer_host/render_widget_host_view_mac.h |
+++ b/content/browser/renderer_host/render_widget_host_view_mac.h |
@@ -108,10 +108,10 @@ class RenderWidgetHostViewMacEditCommandHelper; |
NSRange selectedRange_; |
// Text to be inserted which was generated by handling a key down event. |
- string16 textToBeInserted_; |
+ base::string16 textToBeInserted_; |
// Marked text which was generated by handling a key down event. |
- string16 markedText_; |
+ base::string16 markedText_; |
// Underline information of the |markedText_|. |
std::vector<blink::WebCompositionUnderline> underlines_; |
@@ -264,8 +264,8 @@ class RenderWidgetHostViewMac : public RenderWidgetHostViewBase, |
virtual void RenderProcessGone(base::TerminationStatus status, |
int error_code) OVERRIDE; |
virtual void Destroy() OVERRIDE; |
- virtual void SetTooltipText(const string16& tooltip_text) OVERRIDE; |
- virtual void SelectionChanged(const string16& text, |
+ virtual void SetTooltipText(const base::string16& tooltip_text) OVERRIDE; |
+ virtual void SelectionChanged(const base::string16& text, |
size_t offset, |
const gfx::Range& range) OVERRIDE; |
virtual void SelectionBoundsChanged( |
@@ -338,7 +338,7 @@ class RenderWidgetHostViewMac : public RenderWidgetHostViewBase, |
void EnableCoreAnimation(); |
// Sends completed plugin IME notification and text back to the renderer. |
- void PluginImeCompositionCompleted(const string16& text, int plugin_id); |
+ void PluginImeCompositionCompleted(const base::string16& text, int plugin_id); |
const std::string& selected_text() const { return selected_text_; } |
@@ -526,7 +526,7 @@ class RenderWidgetHostViewMac : public RenderWidgetHostViewBase, |
bool is_loading_; |
// The text to be shown in the tooltip, supplied by the renderer. |
- string16 tooltip_text_; |
+ base::string16 tooltip_text_; |
// Factory used to safely scope delayed calls to ShutdownHost(). |
base::WeakPtrFactory<RenderWidgetHostViewMac> weak_factory_; |