diff options
Diffstat (limited to 'content/common/view_messages.h')
| -rw-r--r-- | content/common/view_messages.h | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/content/common/view_messages.h b/content/common/view_messages.h index 2e8d41a..3ff33ca 100644 --- a/content/common/view_messages.h +++ b/content/common/view_messages.h @@ -338,7 +338,7 @@ IPC_STRUCT_BEGIN(ViewHostMsg_CreateWindow_Params) // The name of the resulting frame that should be created (empty if none // has been specified). - IPC_STRUCT_MEMBER(string16, frame_name) + IPC_STRUCT_MEMBER(base::string16, frame_name) // The frame identifier of the frame initiating the open. IPC_STRUCT_MEMBER(int64, opener_frame_id) @@ -373,7 +373,7 @@ IPC_STRUCT_BEGIN(ViewHostMsg_CreateWindow_Params) // The additional window features to use for the new view. We pass these // separately from |features| above because we cannot serialize WebStrings // over IPC. - IPC_STRUCT_MEMBER(std::vector<string16>, additional_features) + IPC_STRUCT_MEMBER(std::vector<base::string16>, additional_features) IPC_STRUCT_END() IPC_STRUCT_BEGIN(ViewHostMsg_CreateWorker_Params) @@ -381,7 +381,7 @@ IPC_STRUCT_BEGIN(ViewHostMsg_CreateWorker_Params) IPC_STRUCT_MEMBER(GURL, url) // Name for a SharedWorker, otherwise empty string. - IPC_STRUCT_MEMBER(string16, name) + IPC_STRUCT_MEMBER(base::string16, name) // The ID of the parent document (unique within parent renderer). IPC_STRUCT_MEMBER(unsigned long long, document_id) @@ -417,14 +417,14 @@ IPC_STRUCT_BEGIN(ViewHostMsg_DidFailProvisionalLoadWithError_Params) // The frame ID for the failure report. IPC_STRUCT_MEMBER(int64, frame_id) // The WebFrame's uniqueName(). - IPC_STRUCT_MEMBER(string16, frame_unique_name) + IPC_STRUCT_MEMBER(base::string16, frame_unique_name) // True if this is the top-most frame. IPC_STRUCT_MEMBER(bool, is_main_frame) // Error code as reported in the DidFailProvisionalLoad callback. IPC_STRUCT_MEMBER(int, error_code) // An error message generated from the error_code. This can be an empty // string if we were unable to find a meaningful description. - IPC_STRUCT_MEMBER(string16, error_description) + IPC_STRUCT_MEMBER(base::string16, error_description) // The URL that the error is reported for. IPC_STRUCT_MEMBER(GURL, url) // True if the failure is the result of navigating to a POST again @@ -442,7 +442,7 @@ IPC_STRUCT_BEGIN_WITH_PARENT(ViewHostMsg_FrameNavigate_Params, IPC_STRUCT_MEMBER(int64, frame_id) // The WebFrame's uniqueName(). - IPC_STRUCT_MEMBER(string16, frame_unique_name) + IPC_STRUCT_MEMBER(base::string16, frame_unique_name) // Information regarding the security of the connection (empty if the // connection was not secure). @@ -735,7 +735,7 @@ IPC_STRUCT_BEGIN(ViewMsg_New_Params) IPC_STRUCT_MEMBER(int64, session_storage_namespace_id) // The name of the frame associated with this view (or empty if none). - IPC_STRUCT_MEMBER(string16, frame_name) + IPC_STRUCT_MEMBER(base::string16, frame_name) // The route ID of the opener RenderView if we need to set one // (MSG_ROUTING_NONE otherwise). @@ -766,7 +766,7 @@ IPC_STRUCT_END() IPC_STRUCT_BEGIN(ViewMsg_PostMessage_Params) // The serialized script value. - IPC_STRUCT_MEMBER(string16, data) + IPC_STRUCT_MEMBER(base::string16, data) // When sent to the browser, this is the routing ID of the source frame in // the source process. The browser replaces it with the routing ID of the @@ -774,10 +774,10 @@ IPC_STRUCT_BEGIN(ViewMsg_PostMessage_Params) IPC_STRUCT_MEMBER(int, source_routing_id) // The origin of the source frame. - IPC_STRUCT_MEMBER(string16, source_origin) + IPC_STRUCT_MEMBER(base::string16, source_origin) // The origin for the message's target. - IPC_STRUCT_MEMBER(string16, target_origin) + IPC_STRUCT_MEMBER(base::string16, target_origin) // Information about the MessagePorts this message contains. IPC_STRUCT_MEMBER(std::vector<int>, message_port_ids) @@ -961,7 +961,7 @@ IPC_MESSAGE_ROUTED0(ViewMsg_ReloadFrame) // Sent when the user wants to search for a word on the page (find in page). IPC_MESSAGE_ROUTED3(ViewMsg_Find, int /* request_id */, - string16 /* search_text */, + base::string16 /* search_text */, blink::WebFindOptions) // This message notifies the renderer that the user has closed the FindInPage @@ -1020,8 +1020,8 @@ IPC_MESSAGE_ROUTED2(ViewMsg_PluginActionAt, // ViewHostMsg_ScriptEvalResponse is passed the ID parameter so that the // client can uniquely identify the request. IPC_MESSAGE_ROUTED4(ViewMsg_ScriptEvalRequest, - string16, /* frame_xpath */ - string16, /* jscript_url */ + base::string16, /* frame_xpath */ + base::string16, /* jscript_url */ int, /* ID */ bool /* If true, result is sent back. */) @@ -1036,7 +1036,7 @@ IPC_MESSAGE_ROUTED0(ViewMsg_DisownOpener) // into that frame's document. See ViewMsg_ScriptEvalRequest for details on // allowed xpath expressions. IPC_MESSAGE_ROUTED2(ViewMsg_CSSInsertRequest, - string16, /* frame_xpath */ + base::string16, /* frame_xpath */ std::string /* css string */) // Change the zoom level for the current main frame. If the level actually @@ -1113,14 +1113,14 @@ IPC_MESSAGE_ROUTED0(ViewMsg_CandidateWindowHidden) // This message sends a string being composed with an input method. IPC_MESSAGE_ROUTED4( ViewMsg_ImeSetComposition, - string16, /* text */ + base::string16, /* text */ std::vector<blink::WebCompositionUnderline>, /* underlines */ int, /* selectiont_start */ int /* selection_end */) // This message confirms an ongoing composition. IPC_MESSAGE_ROUTED3(ViewMsg_ImeConfirmComposition, - string16 /* text */, + base::string16 /* text */, gfx::Range /* replacement_range */, bool /* keep_selection */) @@ -1376,7 +1376,7 @@ IPC_MESSAGE_ROUTED1(ViewMsg_SetInLiveResize, // Tell the renderer that plugin IME has completed. IPC_MESSAGE_ROUTED2(ViewMsg_PluginImeCompositionCompleted, - string16 /* text */, + base::string16 /* text */, int /* plugin_id */) // External popup menus. @@ -1584,7 +1584,7 @@ IPC_MESSAGE_ROUTED3(ViewHostMsg_DidFinishLoad, // title changes. IPC_MESSAGE_ROUTED3(ViewHostMsg_UpdateTitle, int32 /* page_id */, - string16 /* title */, + base::string16 /* title */, blink::WebTextDirection /* title direction */) // Change the encoding name of the page in UI when the page has detected @@ -1649,7 +1649,7 @@ IPC_MESSAGE_ROUTED5(ViewHostMsg_DidFailLoadWithError, GURL /* validated_url */, bool /* is_main_frame */, int /* error_code */, - string16 /* error_description */) + base::string16 /* error_description */) // Sent when the renderer fails a provisional load with an error. IPC_MESSAGE_ROUTED1(ViewHostMsg_DidFailProvisionalLoadWithError, @@ -1811,7 +1811,7 @@ IPC_MESSAGE_ROUTED2(ViewHostMsg_AppCacheAccessed, IPC_MESSAGE_ROUTED3(ViewHostMsg_DownloadUrl, GURL /* url */, content::Referrer /* referrer */, - string16 /* suggested_name */) + base::string16 /* suggested_name */) // Used to go to the session history entry at the given offset (ie, -1 will // return the "back" item). @@ -1828,12 +1828,12 @@ IPC_MESSAGE_ROUTED1(ViewHostMsg_RouteMessageEvent, ViewMsg_PostMessage_Params) IPC_SYNC_MESSAGE_ROUTED4_2(ViewHostMsg_RunJavaScriptMessage, - string16 /* in - alert message */, - string16 /* in - default prompt */, + base::string16 /* in - alert message */, + base::string16 /* in - default prompt */, GURL /* in - originating page URL */, content::JavaScriptMessageType /* in - type */, bool /* out - success */, - string16 /* out - user_input field */) + base::string16 /* out - user_input field */) // Requests that the given URL be opened in the specified manner. IPC_MESSAGE_ROUTED1(ViewHostMsg_OpenURL, ViewHostMsg_OpenURL_Params) @@ -1962,7 +1962,7 @@ IPC_SYNC_MESSAGE_ROUTED1_0(ViewHostMsg_DestroyPluginContainer, // Send the tooltip text for the current mouse position to the browser. IPC_MESSAGE_ROUTED2(ViewHostMsg_SetTooltipText, - string16 /* tooltip text string */, + base::string16 /* tooltip text string */, blink::WebTextDirection /* text direction hint */) IPC_MESSAGE_ROUTED0(ViewHostMsg_SelectRange_ACK) @@ -1972,7 +1972,7 @@ IPC_MESSAGE_ROUTED0(ViewHostMsg_MoveCaret_ACK) // Note: The secound parameter is the character based offset of the string16 // text in the document. IPC_MESSAGE_ROUTED3(ViewHostMsg_SelectionChanged, - string16 /* text covers the selection range */, + base::string16 /* text covers the selection range */, size_t /* the offset of the text in the document */, gfx::Range /* selection range in the document */) @@ -2032,9 +2032,9 @@ IPC_MESSAGE_ROUTED0(ViewHostMsg_ImeCancelComposition) // or debugger UI. IPC_MESSAGE_ROUTED4(ViewHostMsg_AddMessageToConsole, int32, /* log level */ - string16, /* msg */ + base::string16, /* msg */ int32, /* line number */ - string16 /* source id */ ) + base::string16 /* source id */ ) // Sent by the renderer process to indicate that a plugin instance has crashed. // Note: |plugin_pid| should not be trusted. The corresponding process has @@ -2049,11 +2049,11 @@ IPC_MESSAGE_ROUTED2(ViewHostMsg_CrashedPlugin, // page. Replies true if yes, false otherwise, the reply string is ignored, // but is included so that we can use OnJavaScriptMessageBoxClosed. IPC_SYNC_MESSAGE_ROUTED3_2(ViewHostMsg_RunBeforeUnloadConfirm, - GURL, /* in - originating frame URL */ - string16 /* in - alert message */, - bool /* in - is a reload */, - bool /* out - success */, - string16 /* out - This is ignored.*/) + GURL, /* in - originating frame URL */ + base::string16 /* in - alert message */, + bool /* in - is a reload */, + bool /* out - success */, + base::string16 /* out - This is ignored.*/) // Sent when a provisional load on the main frame redirects. IPC_MESSAGE_ROUTED3(ViewHostMsg_DidRedirectProvisionalLoad, @@ -2152,7 +2152,7 @@ IPC_MESSAGE_ROUTED0(ViewHostMsg_JSOutOfMemory) IPC_MESSAGE_ROUTED4(ViewHostMsg_RegisterProtocolHandler, std::string /* scheme */, GURL /* url */, - string16 /* title */, + base::string16 /* title */, bool /* user_gesture */) // Stores new inspector setting in the profile. @@ -2343,7 +2343,7 @@ IPC_MESSAGE_ROUTED0(ViewHostMsg_StartPluginIme) // for details. IPC_SYNC_MESSAGE_CONTROL2_0(ViewHostMsg_PreCacheFontCharacters, LOGFONT /* font_data */, - string16 /* characters */) + base::string16 /* characters */) #endif #if defined(OS_POSIX) |