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

Side by Side Diff: ppapi/proxy/pdf_resource.cc

Issue 111373008: Update some uses of char16 to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 months 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/proxy/proxy_resolver_v8.cc ('k') | ppapi/shared_impl/ppb_gamepad_shared.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ppapi/proxy/pdf_resource.h" 5 #include "ppapi/proxy/pdf_resource.h"
6 6
7 #include <stdlib.h> 7 #include <stdlib.h>
8 #include <string.h> 8 #include <string.h>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 return PP_MakeUndefined(); 55 return PP_MakeUndefined();
56 return ppapi::StringVar::StringToPPVar(localized_string); 56 return ppapi::StringVar::StringToPPVar(localized_string);
57 } 57 }
58 58
59 void PDFResource::SearchString(const unsigned short* input_string, 59 void PDFResource::SearchString(const unsigned short* input_string,
60 const unsigned short* input_term, 60 const unsigned short* input_term,
61 bool case_sensitive, 61 bool case_sensitive,
62 PP_PrivateFindResult** results, int* count) { 62 PP_PrivateFindResult** results, int* count) {
63 if (locale_.empty()) 63 if (locale_.empty())
64 locale_ = GetLocale(); 64 locale_ = GetLocale();
65 const char16* string = reinterpret_cast<const char16*>(input_string); 65 const base::char16* string =
66 const char16* term = reinterpret_cast<const char16*>(input_term); 66 reinterpret_cast<const base::char16*>(input_string);
67 const base::char16* term =
68 reinterpret_cast<const base::char16*>(input_term);
67 69
68 UErrorCode status = U_ZERO_ERROR; 70 UErrorCode status = U_ZERO_ERROR;
69 UStringSearch* searcher = usearch_open(term, -1, string, -1, locale_.c_str(), 71 UStringSearch* searcher = usearch_open(term, -1, string, -1, locale_.c_str(),
70 0, &status); 72 0, &status);
71 DCHECK(status == U_ZERO_ERROR || status == U_USING_FALLBACK_WARNING || 73 DCHECK(status == U_ZERO_ERROR || status == U_USING_FALLBACK_WARNING ||
72 status == U_USING_DEFAULT_WARNING); 74 status == U_USING_DEFAULT_WARNING);
73 UCollationStrength strength = case_sensitive ? UCOL_TERTIARY : UCOL_PRIMARY; 75 UCollationStrength strength = case_sensitive ? UCOL_TERTIARY : UCOL_PRIMARY;
74 76
75 UCollator* collator = usearch_getCollator(searcher); 77 UCollator* collator = usearch_getCollator(searcher);
76 if (ucol_getStrength(collator) != strength) { 78 if (ucol_getStrength(collator) != strength) {
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 PP_Resource PDFResource::GetResourceImage(PP_ResourceImage image_id) { 189 PP_Resource PDFResource::GetResourceImage(PP_ResourceImage image_id) {
188 return GetResourceImageForScale(image_id, 1.0f); 190 return GetResourceImageForScale(image_id, 1.0f);
189 } 191 }
190 192
191 PP_Bool PDFResource::IsOutOfProcess() { 193 PP_Bool PDFResource::IsOutOfProcess() {
192 return PP_TRUE; 194 return PP_TRUE;
193 } 195 }
194 196
195 } // namespace proxy 197 } // namespace proxy
196 } // namespace ppapi 198 } // namespace ppapi
OLDNEW
« no previous file with comments | « net/proxy/proxy_resolver_v8.cc ('k') | ppapi/shared_impl/ppb_gamepad_shared.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698