content/browser/renderer_host/render_widget_host_view_win.h - Issue 102593002: Convert string16 to base::string16 in content.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/render_widget_host_view_win.h

Issue 102593002: Convert string16 to base::string16 in content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_mac_unittest.mm ('k') | content/browser/renderer_host/render_widget_host_view_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_widget_host_view_win.h

diff --git a/content/browser/renderer_host/render_widget_host_view_win.h b/content/browser/renderer_host/render_widget_host_view_win.h

index 72b22aa756b278aef94392da9f52b3d62387d03d..b9a87bf61e8742cb16ba27b35c37a74f43bb4c88 100644

--- a/content/browser/renderer_host/render_widget_host_view_win.h

+++ b/content/browser/renderer_host/render_widget_host_view_win.h

@@ -202,7 +202,7 @@ class RenderWidgetHostViewWin

// called by WebContentsImpl before DestroyWindow

virtual void WillWmDestroy() OVERRIDE;

virtual void Destroy() OVERRIDE;

- virtual void SetTooltipText(const string16& tooltip_text) OVERRIDE;

+ virtual void SetTooltipText(const base::string16& tooltip_text) OVERRIDE;

virtual BackingStore* AllocBackingStore(const gfx::Size& size) OVERRIDE;

virtual void CopyFromCompositingSurface(

const gfx::Rect& src_subrect,

@@ -270,7 +270,7 @@ class RenderWidgetHostViewWin

const ui::CompositionText& composition) OVERRIDE;

virtual void ConfirmCompositionText() OVERRIDE;

virtual void ClearCompositionText() OVERRIDE;

- virtual void InsertText(const string16& text) OVERRIDE;

+ virtual void InsertText(const base::string16& text) OVERRIDE;

virtual void InsertChar(char16 ch, int flags) OVERRIDE;

virtual gfx::NativeWindow GetAttachedWindow() const OVERRIDE;

virtual ui::TextInputType GetTextInputType() const OVERRIDE;

@@ -286,7 +286,7 @@ class RenderWidgetHostViewWin

virtual bool SetSelectionRange(const gfx::Range& range) OVERRIDE;

virtual bool DeleteRange(const gfx::Range& range) OVERRIDE;

virtual bool GetTextFromRange(const gfx::Range& range,

- string16* text) const OVERRIDE;

+ base::string16* text) const OVERRIDE;

virtual void OnInputMethodChanged() OVERRIDE;

virtual bool ChangeTextDirectionAndLayoutAlignment(

base::i18n::TextDirection direction) OVERRIDE;

@@ -516,7 +516,7 @@ class RenderWidgetHostViewWin

// Tooltips

// The text to be shown in the tooltip, supplied by the renderer.

- string16 tooltip_text_;

+ base::string16 tooltip_text_;

// The tooltip control hwnd

HWND tooltip_hwnd_;

// Whether or not a tooltip is currently visible. We use this to track