diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-25 21:57:26 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-25 21:57:26 +0000 |
| commit | c84c479fdf0ff331f11e17a9753686d21d2ee16b (patch) | |
| tree | 5fee05ec877add08bc6d60cc0975ad5f4aa4f254 /ppapi | |
| parent | 76d5aab62bea96fdfc558cbecb52685ca1651870 (diff) | |
| download | chromium_src-c84c479fdf0ff331f11e17a9753686d21d2ee16b.zip chromium_src-c84c479fdf0ff331f11e17a9753686d21d2ee16b.tar.gz chromium_src-c84c479fdf0ff331f11e17a9753686d21d2ee16b.tar.bz2 | |
Update some uses of char16 to use the base:: namespace.
BUG=329295
TEST=no change
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/111373008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242507 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/proxy/pdf_resource.cc | 6 | ||||
| -rw-r--r-- | ppapi/shared_impl/ppb_gamepad_shared.h | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/ppapi/proxy/pdf_resource.cc b/ppapi/proxy/pdf_resource.cc index 80c4237..6672bac 100644 --- a/ppapi/proxy/pdf_resource.cc +++ b/ppapi/proxy/pdf_resource.cc @@ -62,8 +62,10 @@ void PDFResource::SearchString(const unsigned short* input_string, PP_PrivateFindResult** results, int* count) { if (locale_.empty()) locale_ = GetLocale(); - const char16* string = reinterpret_cast<const char16*>(input_string); - const char16* term = reinterpret_cast<const char16*>(input_term); + const base::char16* string = + reinterpret_cast<const base::char16*>(input_string); + const base::char16* term = + reinterpret_cast<const base::char16*>(input_term); UErrorCode status = U_ZERO_ERROR; UStringSearch* searcher = usearch_open(term, -1, string, -1, locale_.c_str(), diff --git a/ppapi/shared_impl/ppb_gamepad_shared.h b/ppapi/shared_impl/ppb_gamepad_shared.h index 72d5331..821980f 100644 --- a/ppapi/shared_impl/ppb_gamepad_shared.h +++ b/ppapi/shared_impl/ppb_gamepad_shared.h @@ -28,7 +28,7 @@ struct WebKitGamepad { bool connected; // Device identifier (based on manufacturer, model, etc.). - char16 id[kIdLengthCap]; + base::char16 id[kIdLengthCap]; // Monotonically increasing value referring to when the data were last // updated. |