diff options
Diffstat (limited to 'content/child')
-rw-r--r-- | content/child/browser_font_resource_trusted.cc | 12 | ||||
-rw-r--r-- | content/child/db_message_filter.cc | 4 | ||||
-rw-r--r-- | content/child/db_message_filter.h | 4 | ||||
-rw-r--r-- | content/child/indexed_db/indexed_db_dispatcher.cc | 10 | ||||
-rw-r--r-- | content/child/indexed_db/indexed_db_dispatcher.h | 10 | ||||
-rw-r--r-- | content/child/indexed_db/indexed_db_key_builders.cc | 4 | ||||
-rw-r--r-- | content/child/plugin_messages.h | 8 | ||||
-rw-r--r-- | content/child/service_worker/service_worker_dispatcher.cc | 2 | ||||
-rw-r--r-- | content/child/service_worker/service_worker_dispatcher.h | 2 | ||||
-rw-r--r-- | content/child/webkitplatformsupport_impl.cc | 2 | ||||
-rw-r--r-- | content/child/webkitplatformsupport_impl.h | 2 | ||||
-rw-r--r-- | content/child/webmessageportchannel_impl.cc | 4 | ||||
-rw-r--r-- | content/child/webmessageportchannel_impl.h | 4 |
13 files changed, 34 insertions, 34 deletions
diff --git a/content/child/browser_font_resource_trusted.cc b/content/child/browser_font_resource_trusted.cc index 35ad824..be4a8b6 100644 --- a/content/child/browser_font_resource_trusted.cc +++ b/content/child/browser_font_resource_trusted.cc @@ -43,14 +43,14 @@ namespace { // undefined reference linker error. const char kCommonScript[] = "Zyyy"; -string16 GetFontFromMap( +base::string16 GetFontFromMap( const webkit_glue::ScriptFontFamilyMap& map, const std::string& script) { webkit_glue::ScriptFontFamilyMap::const_iterator it = map.find(script); if (it != map.end()) return it->second; - return string16(); + return base::string16(); } // Splits a PP_BrowserFont_Trusted_TextRun into a sequence or LTR and RTL @@ -85,7 +85,7 @@ class TextRunCollection { ubidi_close(bidi_); } - const string16& text() const { return text_; } + const base::string16& text() const { return text_; } int num_runs() const { return num_runs_; } // Returns a WebTextRun with the info for the run at the given index. @@ -94,7 +94,7 @@ class TextRunCollection { DCHECK(index < num_runs_); if (bidi_) { bool run_rtl = !!ubidi_getVisualRun(bidi_, index, run_start, run_len); - return WebTextRun(string16(&text_[*run_start], *run_len), + return WebTextRun(base::string16(&text_[*run_start], *run_len), run_rtl, true); } @@ -110,7 +110,7 @@ class TextRunCollection { UBiDi* bidi_; // Text of all the runs. - string16 text_; + base::string16 text_; int num_runs_; @@ -167,7 +167,7 @@ WebFontDescription PPFontDescToWebFontDesc( StringVar* face_name = StringVar::FromPPVar(font.face); // Possibly null. WebFontDescription result; - string16 resolved_family; + base::string16 resolved_family; if (!face_name || face_name->value().empty()) { // Resolve the generic family. switch (font.family) { diff --git a/content/child/db_message_filter.cc b/content/child/db_message_filter.cc index 93fe885..f50d080 100644 --- a/content/child/db_message_filter.cc +++ b/content/child/db_message_filter.cc @@ -31,7 +31,7 @@ bool DBMessageFilter::OnMessageReceived(const IPC::Message& message) { } void DBMessageFilter::OnDatabaseUpdateSize(const std::string& origin_identifier, - const string16& database_name, + const base::string16& database_name, int64 database_size) { blink::WebDatabase::updateDatabaseSize( WebString::fromUTF8(origin_identifier), database_name, database_size); @@ -52,7 +52,7 @@ void DBMessageFilter::OnDatabaseResetSpaceAvailable( void DBMessageFilter::OnDatabaseCloseImmediately( const std::string& origin_identifier, - const string16& database_name) { + const base::string16& database_name) { blink::WebDatabase::closeDatabaseImmediately( WebString::fromUTF8(origin_identifier), database_name); } diff --git a/content/child/db_message_filter.h b/content/child/db_message_filter.h index e918df6..4950006 100644 --- a/content/child/db_message_filter.h +++ b/content/child/db_message_filter.h @@ -23,13 +23,13 @@ class DBMessageFilter : public IPC::ChannelProxy::MessageFilter { private: void OnDatabaseUpdateSize(const std::string& origin_identifier, - const string16& database_name, + const base::string16& database_name, int64 database_size); void OnDatabaseUpdateSpaceAvailable(const std::string& origin_identifier, int64 space_available); void OnDatabaseResetSpaceAvailable(const std::string& origin_identifier); void OnDatabaseCloseImmediately(const std::string& origin_identifier, - const string16& database_name); + const base::string16& database_name); }; } // namespace content diff --git a/content/child/indexed_db/indexed_db_dispatcher.cc b/content/child/indexed_db/indexed_db_dispatcher.cc index 2b97b4a..9fa1d66 100644 --- a/content/child/indexed_db/indexed_db_dispatcher.cc +++ b/content/child/indexed_db/indexed_db_dispatcher.cc @@ -213,7 +213,7 @@ void IndexedDBDispatcher::RequestIDBCursorPrefetchReset(int used_prefetches, } void IndexedDBDispatcher::RequestIDBFactoryOpen( - const string16& name, + const base::string16& name, int64 version, int64 transaction_id, WebIDBCallbacks* callbacks_ptr, @@ -250,7 +250,7 @@ void IndexedDBDispatcher::RequestIDBFactoryGetDatabaseNames( } void IndexedDBDispatcher::RequestIDBFactoryDeleteDatabase( - const string16& name, + const base::string16& name, WebIDBCallbacks* callbacks_ptr, const std::string& database_identifier) { ResetCursorPrefetchCaches(); @@ -487,7 +487,7 @@ void IndexedDBDispatcher::OnSuccessIndexedDBKey(int32 ipc_thread_id, void IndexedDBDispatcher::OnSuccessStringList( int32 ipc_thread_id, int32 ipc_callbacks_id, - const std::vector<string16>& value) { + const std::vector<base::string16>& value) { DCHECK_EQ(ipc_thread_id, CurrentWorkerId()); WebIDBCallbacks* callbacks = pending_callbacks_.Lookup(ipc_callbacks_id); if (!callbacks) @@ -652,7 +652,7 @@ void IndexedDBDispatcher::OnUpgradeNeeded( void IndexedDBDispatcher::OnError(int32 ipc_thread_id, int32 ipc_callbacks_id, int code, - const string16& message) { + const base::string16& message) { DCHECK_EQ(ipc_thread_id, CurrentWorkerId()); WebIDBCallbacks* callbacks = pending_callbacks_.Lookup(ipc_callbacks_id); if (!callbacks) @@ -668,7 +668,7 @@ void IndexedDBDispatcher::OnAbort(int32 ipc_thread_id, int32 ipc_database_callbacks_id, int64 transaction_id, int code, - const string16& message) { + const base::string16& message) { DCHECK_EQ(ipc_thread_id, CurrentWorkerId()); WebIDBDatabaseCallbacks* callbacks = pending_database_callbacks_.Lookup(ipc_database_callbacks_id); diff --git a/content/child/indexed_db/indexed_db_dispatcher.h b/content/child/indexed_db/indexed_db_dispatcher.h index 6d60e29..a9f3653 100644 --- a/content/child/indexed_db/indexed_db_dispatcher.h +++ b/content/child/indexed_db/indexed_db_dispatcher.h @@ -71,14 +71,14 @@ class CONTENT_EXPORT IndexedDBDispatcher const std::string& database_identifier); void RequestIDBFactoryOpen( - const string16& name, + const base::string16& name, int64 version, int64 transaction_id, blink::WebIDBCallbacks* callbacks, blink::WebIDBDatabaseCallbacks* database_callbacks, const std::string& database_identifier); - void RequestIDBFactoryDeleteDatabase(const string16& name, + void RequestIDBFactoryDeleteDatabase(const base::string16& name, blink::WebIDBCallbacks* callbacks, const std::string& database_identifier); @@ -192,7 +192,7 @@ class CONTENT_EXPORT IndexedDBDispatcher const IndexedDBMsg_CallbacksSuccessCursorPrefetch_Params& p); void OnSuccessStringList(int32 ipc_thread_id, int32 ipc_callbacks_id, - const std::vector<string16>& value); + const std::vector<base::string16>& value); void OnSuccessValue(int32 ipc_thread_id, int32 ipc_callbacks_id, const std::string& value); @@ -208,7 +208,7 @@ class CONTENT_EXPORT IndexedDBDispatcher void OnError(int32 ipc_thread_id, int32 ipc_callbacks_id, int code, - const string16& message); + const base::string16& message); void OnIntBlocked(int32 ipc_thread_id, int32 ipc_callbacks_id, int64 existing_version); @@ -217,7 +217,7 @@ class CONTENT_EXPORT IndexedDBDispatcher int32 ipc_database_id, int64 transaction_id, int code, - const string16& message); + const base::string16& message); void OnComplete(int32 ipc_thread_id, int32 ipc_database_id, int64 transaction_id); diff --git a/content/child/indexed_db/indexed_db_key_builders.cc b/content/child/indexed_db/indexed_db_key_builders.cc index a17065f..ed84ac4 100644 --- a/content/child/indexed_db/indexed_db_key_builders.cc +++ b/content/child/indexed_db/indexed_db_key_builders.cc @@ -30,9 +30,9 @@ static content::IndexedDBKey::KeyArray CopyKeyArray(const WebIDBKey& other) { return result; } -static std::vector<string16> CopyArray( +static std::vector<base::string16> CopyArray( const WebVector<WebString>& array) { - std::vector<string16> copy(array.size()); + std::vector<base::string16> copy(array.size()); for (size_t i = 0; i < array.size(); ++i) copy[i] = array[i]; return copy; diff --git a/content/child/plugin_messages.h b/content/child/plugin_messages.h index 404439f..92651e9 100644 --- a/content/child/plugin_messages.h +++ b/content/child/plugin_messages.h @@ -111,7 +111,7 @@ IPC_SYNC_MESSAGE_ROUTED0_1(PluginMsg_GetPluginScriptableObject, // Gets the form value of the plugin instance synchronously. IPC_SYNC_MESSAGE_ROUTED0_2(PluginMsg_GetFormValue, - string16 /* value */, + base::string16 /* value */, bool /* success */) IPC_MESSAGE_ROUTED3(PluginMsg_DidFinishLoadWithReason, @@ -197,13 +197,13 @@ IPC_MESSAGE_CONTROL1(PluginHostMsg_DidAbortLoading, #if defined(OS_WIN) IPC_MESSAGE_ROUTED4(PluginMsg_ImeCompositionUpdated, - string16 /* text */, + base::string16 /* text */, std::vector<int> /* clauses */, std::vector<int>, /* target */ int /* cursor_position */) IPC_MESSAGE_ROUTED1(PluginMsg_ImeCompositionCompleted, - string16 /* text */) + base::string16 /* text */) #endif #if defined(OS_MACOSX) @@ -222,7 +222,7 @@ IPC_MESSAGE_ROUTED2(PluginMsg_WindowFrameChanged, gfx::Rect /* view_frame */) IPC_MESSAGE_ROUTED1(PluginMsg_ImeCompositionCompleted, - string16 /* text */) + base::string16 /* text */) // This message, used only on 10.6 and later, transmits the "fake" // window handle allocated by the browser on behalf of the renderer diff --git a/content/child/service_worker/service_worker_dispatcher.cc b/content/child/service_worker/service_worker_dispatcher.cc index f5103fb..28c4928 100644 --- a/content/child/service_worker/service_worker_dispatcher.cc +++ b/content/child/service_worker/service_worker_dispatcher.cc @@ -133,7 +133,7 @@ void ServiceWorkerDispatcher::OnRegistrationError( int32 thread_id, int32 request_id, WebServiceWorkerError::ErrorType error_type, - const string16& message) { + const base::string16& message) { WebServiceWorkerProvider::WebServiceWorkerCallbacks* callbacks = pending_callbacks_.Lookup(request_id); DCHECK(callbacks); diff --git a/content/child/service_worker/service_worker_dispatcher.h b/content/child/service_worker/service_worker_dispatcher.h index 51a1e21..ef2796b 100644 --- a/content/child/service_worker/service_worker_dispatcher.h +++ b/content/child/service_worker/service_worker_dispatcher.h @@ -65,7 +65,7 @@ class ServiceWorkerDispatcher : public webkit_glue::WorkerTaskRunner::Observer { void OnRegistrationError(int32 thread_id, int32 request_id, blink::WebServiceWorkerError::ErrorType error_type, - const string16& message); + const base::string16& message); IDMap<blink::WebServiceWorkerProvider::WebServiceWorkerCallbacks, IDMapOwnPointer> pending_callbacks_; diff --git a/content/child/webkitplatformsupport_impl.cc b/content/child/webkitplatformsupport_impl.cc index e474aa9..5b8cc79 100644 --- a/content/child/webkitplatformsupport_impl.cc +++ b/content/child/webkitplatformsupport_impl.cc @@ -17,7 +17,7 @@ WebKitPlatformSupportImpl::WebKitPlatformSupportImpl() { WebKitPlatformSupportImpl::~WebKitPlatformSupportImpl() { } -string16 WebKitPlatformSupportImpl::GetLocalizedString(int message_id) { +base::string16 WebKitPlatformSupportImpl::GetLocalizedString(int message_id) { return GetContentClient()->GetLocalizedString(message_id); } diff --git a/content/child/webkitplatformsupport_impl.h b/content/child/webkitplatformsupport_impl.h index e32483b..b4d5fc7 100644 --- a/content/child/webkitplatformsupport_impl.h +++ b/content/child/webkitplatformsupport_impl.h @@ -22,7 +22,7 @@ class CONTENT_EXPORT WebKitPlatformSupportImpl WebKitPlatformSupportImpl(); virtual ~WebKitPlatformSupportImpl(); - virtual string16 GetLocalizedString(int message_id) OVERRIDE; + virtual base::string16 GetLocalizedString(int message_id) OVERRIDE; virtual base::StringPiece GetDataResource( int resource_id, ui::ScaleFactor scale_factor) OVERRIDE; diff --git a/content/child/webmessageportchannel_impl.cc b/content/child/webmessageportchannel_impl.cc index aeb8475..7b0658e 100644 --- a/content/child/webmessageportchannel_impl.cc +++ b/content/child/webmessageportchannel_impl.cc @@ -202,7 +202,7 @@ bool WebMessagePortChannelImpl::OnMessageReceived(const IPC::Message& message) { } void WebMessagePortChannelImpl::OnMessage( - const string16& message, + const base::string16& message, const std::vector<int>& sent_message_port_ids, const std::vector<int>& new_routing_ids) { base::AutoLock auto_lock(lock_); @@ -230,7 +230,7 @@ void WebMessagePortChannelImpl::OnMessagesQueued() { base::AutoLock auto_lock(lock_); queued_messages.reserve(message_queue_.size()); while (!message_queue_.empty()) { - string16 message = message_queue_.front().message; + base::string16 message = message_queue_.front().message; const std::vector<WebMessagePortChannelImpl*>& channel_array = message_queue_.front().ports; std::vector<int> port_ids(channel_array.size()); diff --git a/content/child/webmessageportchannel_impl.h b/content/child/webmessageportchannel_impl.h index 8390972..efc1e04 100644 --- a/content/child/webmessageportchannel_impl.h +++ b/content/child/webmessageportchannel_impl.h @@ -58,7 +58,7 @@ class WebMessagePortChannelImpl // IPC::Listener implementation. virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; - void OnMessage(const string16& message, + void OnMessage(const base::string16& message, const std::vector<int>& sent_message_port_ids, const std::vector<int>& new_routing_ids); void OnMessagesQueued(); @@ -67,7 +67,7 @@ class WebMessagePortChannelImpl Message(); ~Message(); - string16 message; + base::string16 message; std::vector<WebMessagePortChannelImpl*> ports; }; |