ui/aura/remote_root_window_host_win.h - Issue 117983002: Prefix string16 with base:: in ui/.

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: ui/aura/remote_root_window_host_win.h

Issue 117983002: Prefix string16 with base:: in ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merge 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:

Index: ui/aura/remote_root_window_host_win.h

diff --git a/ui/aura/remote_root_window_host_win.h b/ui/aura/remote_root_window_host_win.h

index 6ccf94d133f4c8662bdbe90c2314f5f36dd6902b..41774e2ca583589ca37eb15eb30bad3fb124133c 100644

--- a/ui/aura/remote_root_window_host_win.h

+++ b/ui/aura/remote_root_window_host_win.h

@@ -196,11 +196,11 @@ class AURA_EXPORT RemoteRootWindowHostWin

ui::RemoteInputMethodPrivateWin* GetRemoteInputMethodPrivate();

void OnImeCandidatePopupChanged(bool visible);

void OnImeCompositionChanged(

- const string16& text,

+ const base::string16& text,

int32 selection_start,

int32 selection_end,

const std::vector<metro_viewer::UnderlineInfo>& underlines);

- void OnImeTextCommitted(const string16& text);

+ void OnImeTextCommitted(const base::string16& text);

void OnImeInputSourceChanged(uint16 language_id, bool is_ime);

// RootWindowHost overrides:

« no previous file with comments | « ui/app_list/views/apps_grid_view_unittest.cc ('k') | ui/aura/remote_root_window_host_win.cc » ('j') | no next file with comments »