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

Unified Diff: content/renderer/render_view_browsertest.cc

Issue 113403006: Update some uses of char16 to use the base:: namespace. (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/renderer/android/address_detector.cc ('k') | content/shell/renderer/test_runner/WebTestProxy.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_browsertest.cc
diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
index 35f340085b23dc69a858ad545563c56036cb77fc..136156198c63a7ecf58bd53398581c667a1e01c4 100644
--- a/content/renderer/render_view_browsertest.cc
+++ b/content/renderer/render_view_browsertest.cc
@@ -222,7 +222,7 @@ class RenderViewImplTest : public RenderViewTest {
long c = GetCharacterFromKeyCode(static_cast<ui::KeyboardCode>(key_code),
flags);
- output->assign(1, static_cast<char16>(c));
+ output->assign(1, static_cast<base::char16>(c));
return 1;
#elif defined(USE_OZONE)
const int flags = ConvertMockKeyboardModifier(modifiers);
@@ -255,7 +255,7 @@ class RenderViewImplTest : public RenderViewTest {
long c = GetCharacterFromKeyCode(static_cast<ui::KeyboardCode>(key_code),
flags);
- output->assign(1, static_cast<char16>(c));
+ output->assign(1, static_cast<base::char16>(c));
return 1;
#elif defined(TOOLKIT_GTK)
// We ignore |layout|, which means we are only testing the layout of the
@@ -288,7 +288,7 @@ class RenderViewImplTest : public RenderViewTest {
gdk_event_free(events[i]);
}
- output->assign(1, static_cast<char16>(unicode_key));
+ output->assign(1, static_cast<base::char16>(unicode_key));
return 1;
#else
NOTIMPLEMENTED();
« no previous file with comments | « content/renderer/android/address_detector.cc ('k') | content/shell/renderer/test_runner/WebTestProxy.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698