mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

refactor: use std::string instead of base::string16 for IPC channel names (ipcRenderer.sendTo) (#14302)

Browse source
This commit is contained in:
Milan Burda 2018-08-25 00:30:10 +02:00 • committed by Samuel Attard
parent 5f6706ac33
commit 2a253c73db
5 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/api/atom_api_web_contents.cc
View file

@ -2081,7 +2081,7 @@ void WebContents::OnRendererMessageSync(content::RenderFrameHost* frame_host,
void WebContents::OnRendererMessageTo(content::RenderFrameHost* frame_host, void WebContents::OnRendererMessageTo(content::RenderFrameHost* frame_host,
bool send_to_all, bool send_to_all,
int32_t web_contents_id, int32_t web_contents_id,
const base::string16& channel, const std::string& channel,
const base::ListValue& args) { const base::ListValue& args) {
auto* web_contents = mate::TrackableObject<WebContents>::FromWeakMapID( auto* web_contents = mate::TrackableObject<WebContents>::FromWeakMapID(
isolate(), web_contents_id); isolate(), web_contents_id);

2
atom/browser/api/atom_api_web_contents.h
View file

@ -423,7 +423,7 @@ class WebContents : public mate::TrackableObject<WebContents>,
void OnRendererMessageTo(content::RenderFrameHost* frame_host, void OnRendererMessageTo(content::RenderFrameHost* frame_host,
bool send_to_all, bool send_to_all,
int32_t web_contents_id, int32_t web_contents_id,
const base::string16& channel, const std::string& channel,
const base::ListValue& args); const base::ListValue& args);
// Called when received a synchronous message from renderer to // Called when received a synchronous message from renderer to

2
atom/common/api/api_messages.h
View file

@ -36,7 +36,7 @@ IPC_SYNC_MESSAGE_ROUTED2_1(AtomFrameHostMsg_Message_Sync,
IPC_MESSAGE_ROUTED4(AtomFrameHostMsg_Message_To, IPC_MESSAGE_ROUTED4(AtomFrameHostMsg_Message_To,
bool /* send_to_all */, bool /* send_to_all */,
int32_t /* web_contents_id */, int32_t /* web_contents_id */,
base::string16 /* channel */, std::string /* channel */,
base::ListValue /* arguments */) base::ListValue /* arguments */)
IPC_MESSAGE_ROUTED3(AtomFrameMsg_Message, IPC_MESSAGE_ROUTED3(AtomFrameMsg_Message,

2
atom/renderer/api/atom_api_renderer_ipc.cc
View file

@ -63,7 +63,7 @@ base::ListValue SendSync(mate::Arguments* args,
void SendTo(mate::Arguments* args, void SendTo(mate::Arguments* args,
bool send_to_all, bool send_to_all,
int32_t web_contents_id, int32_t web_contents_id,
const base::string16& channel, const std::string& channel,
const base::ListValue& arguments) { const base::ListValue& arguments) {
RenderFrame* render_frame = GetCurrentRenderFrame(); RenderFrame* render_frame = GetCurrentRenderFrame();
if (render_frame == nullptr) if (render_frame == nullptr)

2
atom/renderer/api/atom_api_renderer_ipc.h
View file

@ -25,7 +25,7 @@ base::ListValue SendSync(mate::Arguments* args,
void SendTo(mate::Arguments* args, void SendTo(mate::Arguments* args,
bool send_to_all, bool send_to_all,
int32_t web_contents_id, int32_t web_contents_id,
const base::string16& channel, const std::string& channel,
const base::ListValue& arguments); const base::ListValue& arguments);
void Initialize(v8::Local<v8::Object> exports, void Initialize(v8::Local<v8::Object> exports,