Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(493)

Unified Diff: ui/aura/remote_root_window_host_win.cc

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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/aura/remote_root_window_host_win.h ('k') | ui/base/clipboard/clipboard_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/remote_root_window_host_win.cc
diff --git a/ui/aura/remote_root_window_host_win.cc b/ui/aura/remote_root_window_host_win.cc
index db66beb41d475d46bafad6198b5bce2500f78710..8e78046fc2612b5e2fd4c4de92e4592b1b9628c9 100644
--- a/ui/aura/remote_root_window_host_win.cc
+++ b/ui/aura/remote_root_window_host_win.cc
@@ -61,7 +61,7 @@ void SetVirtualKeyStates(uint32 flags) {
}
void FillCompositionText(
- const string16& text,
+ const base::string16& text,
int32 selection_start,
int32 selection_end,
const std::vector<metro_viewer::UnderlineInfo>& underlines,
@@ -652,7 +652,7 @@ void RemoteRootWindowHostWin::OnImeCandidatePopupChanged(bool visible) {
}
void RemoteRootWindowHostWin::OnImeCompositionChanged(
- const string16& text,
+ const base::string16& text,
int32 selection_start,
int32 selection_end,
const std::vector<metro_viewer::UnderlineInfo>& underlines) {
@@ -666,7 +666,7 @@ void RemoteRootWindowHostWin::OnImeCompositionChanged(
remote_input_method_private->OnCompositionChanged(composition_text);
}
-void RemoteRootWindowHostWin::OnImeTextCommitted(const string16& text) {
+void RemoteRootWindowHostWin::OnImeTextCommitted(const base::string16& text) {
ui::RemoteInputMethodPrivateWin* remote_input_method_private =
GetRemoteInputMethodPrivate();
if (!remote_input_method_private)
« no previous file with comments | « ui/aura/remote_root_window_host_win.h ('k') | ui/base/clipboard/clipboard_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698